From 8b945025b474118b00c2aff34daf95ea60fb32ef Mon Sep 17 00:00:00 2001 From: wangtiantian Date: Sat, 18 Jun 2022 14:24:40 +0800 Subject: [PATCH 01/30] IssueNo:#I5CXMN:add cache event Description:add cache event Sig:SIG_ApplicaitonFramework Feature or Bugfix:Feature Binary Source:No Signed-off-by: wangtiantian --- api/@ohos.commonEvent.d.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/@ohos.commonEvent.d.ts b/api/@ohos.commonEvent.d.ts index 7826cee6e6..2b9db6f02c 100644 --- a/api/@ohos.commonEvent.d.ts +++ b/api/@ohos.commonEvent.d.ts @@ -254,6 +254,12 @@ declare namespace commonEvent { */ COMMON_EVENT_PACKAGE_DATA_CLEARED = "usual.event.PACKAGE_DATA_CLEARED", + /** + * this commonEvent means the user has cleared the package cache. + * @since 9 + */ + COMMON_EVENT_PACKAGE_CACHE_CLEARED = "usual.event.PACKAGE_CACHE_CLEARED", + /** * this commonEvent means the packages have been suspended. */ -- Gitee From 10cb7e326ce49dc3a244c9980a8fd4c104adf18a Mon Sep 17 00:00:00 2001 From: "zhangyafei.echo" Date: Mon, 4 Jul 2022 10:32:35 +0800 Subject: [PATCH 02/30] IssueNo:#I581UL Description:Add hasPointerDeivce(bool) to Configuration. Sig:SIG_ApplicationFramework Feature or BugFix: Feature Binary Source: No Signed-off-by: zhangyafei.echo Change-Id: I665478696dc2d2013666c41c77f45d8f0484661e --- api/@ohos.application.Configuration.d.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/api/@ohos.application.Configuration.d.ts b/api/@ohos.application.Configuration.d.ts index fe7a55934c..b1c3861169 100644 --- a/api/@ohos.application.Configuration.d.ts +++ b/api/@ohos.application.Configuration.d.ts @@ -63,4 +63,12 @@ export interface Configuration { * @syscap SystemCapability.Ability.AbilityBase */ displayId?: number; + + /** + * Indicates whether a pointer type device has connected. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityBase + */ + hasPointerDevice?: boolean; } -- Gitee From 841a6ccc16e9c9eacbf02c75b7eeda505cb4e88c Mon Sep 17 00:00:00 2001 From: wangzezhen Date: Fri, 8 Jul 2022 10:46:50 +0800 Subject: [PATCH 03/30] add barPosition Signed-off-by: wangzezhen Change-Id: I90eb85bac6122f4f0e1b26702b34e46af761d233 --- api/@internal/component/ets/tabs.d.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/@internal/component/ets/tabs.d.ts b/api/@internal/component/ets/tabs.d.ts index 509d578ff2..fd878d5d05 100644 --- a/api/@internal/component/ets/tabs.d.ts +++ b/api/@internal/component/ets/tabs.d.ts @@ -89,6 +89,12 @@ declare class TabsAttribute extends CommonMethod { */ vertical(value: boolean): TabsAttribute; + /** + * Called when determining the location of the bar chart. + * @since 9 + */ + barPosition(value: BarPosition): TabsAttribute; + /** * Called when judging whether page switching can be performed by sliding left and right. * @since 7 -- Gitee From 1af2d58df3a7d68915e02a0eee182c58c90139e4 Mon Sep 17 00:00:00 2001 From: m00512953 Date: Sat, 9 Jul 2022 11:24:42 +0800 Subject: [PATCH 04/30] mingxihua@huawei.com.cn Signed-off-by: m00512953 --- api/@ohos.ability.Ability.d.ts | 82 +++++++++++++++++++ api/@ohos.ability.featureAbility.d.ts | 19 ++++- ....application.abilityDelegatorRegistry.d.ts | 43 +++++++++- api/@ohos.application.abilityManager.d.ts | 22 ++++- api/@ohos.application.appManager.d.ts | 61 +++++++++++++- api/@ohos.application.context.d.ts | 30 +++++++ api/@ohos.application.errorManager.d.ts | 10 ++- api/@ohos.application.missionManager.d.ts | 34 +++++++- api/@ohos.wantAgent.d.ts | 22 ++++- api/ability/want.d.ts | 1 + 10 files changed, 310 insertions(+), 14 deletions(-) create mode 100755 api/@ohos.ability.Ability.d.ts diff --git a/api/@ohos.ability.Ability.d.ts b/api/@ohos.ability.Ability.d.ts new file mode 100755 index 0000000000..00e65dc266 --- /dev/null +++ b/api/@ohos.ability.Ability.d.ts @@ -0,0 +1,82 @@ +/* + * 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. + */ + +import { DataAbilityHelper as _DataAbilityHelper } from './ability/dataAbilityHelper'; +import { PacMap as _PacMap } from './ability/dataAbilityHelper'; +import { DataAbilityOperation as _DataAbilityOperation } from './ability/dataAbilityOperation'; +import { DataAbilityResult as _DataAbilityResult } from './ability/dataAbilityResult'; +import { AbilityResult as _AbilityResult } from './ability/abilityResult'; +import { ConnectOptions as _ConnectOptions } from './ability/connectOptions'; +import { StartAbilityParameter as _StartAbilityParameter } from './ability/startAbilityParameter'; + +/** + * The class of an ability. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @StageModelOnly + */ +declare namespace Ability { + + /** + * DataAbilityHelper + * @syscap SystemCapability.Ability.AbilityRuntime.FAModel + * + * @since 9 + * @FAModelOnly + */ + export type DataAbilityHelper = _DataAbilityHelper + + /** + * Defines a PacMap object for storing a series of values. + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.FAModel + * @FAModelOnly + */ + export type PacMap = _PacMap + + /** + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.FAModel + */ + export type DataAbilityOperation = _DataAbilityOperation + + /** + * @name DataAbilityResult + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.FAModel + */ + export type DataAbilityResult = _DataAbilityResult + + /** + * @since 9 + * @syscap SystemCapability.Ability.AbilityBase + */ + export type AbilityResult = _AbilityResult + + /** + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + */ + export type ConnectOptions = _ConnectOptions + + /** + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.FAModel + */ + export type StartAbilityParameter = _StartAbilityParameter +} + +export default Ability; \ No newline at end of file diff --git a/api/@ohos.ability.featureAbility.d.ts b/api/@ohos.ability.featureAbility.d.ts index 109bd803f5..f2e673e613 100644 --- a/api/@ohos.ability.featureAbility.d.ts +++ b/api/@ohos.ability.featureAbility.d.ts @@ -18,9 +18,11 @@ import { Callback } from './basic'; import Want from './@ohos.application.want'; import { StartAbilityParameter } from './ability/startAbilityParameter'; import { AbilityResult } from './ability/abilityResult'; +import { AppVersionInfo as _AppVersionInfo } from './app/appVersionInfo'; import { Context as _Context } from './app/context'; import { DataAbilityHelper } from './ability/dataAbilityHelper'; import { ConnectOptions } from './ability/connectOptions'; +import { ProcessInfo as _ProcessInfo } from './app/processInfo'; import window from './@ohos.window'; /** @@ -224,6 +226,21 @@ declare namespace featureAbility { * @import import abilityManager from 'app/context' * @FAModelOnly */ - export type Context = _Context + export type Context = _Context + + /** + * Defines an AppVersionInfo object. + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + */ + export type AppVersionInfo = _AppVersionInfo + + /** + * @name This class saves process information about an application + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @import import ProcessInfo from 'app/processInfo' + */ + export type ProcessInfo = _ProcessInfo } export default featureAbility; diff --git a/api/@ohos.application.abilityDelegatorRegistry.d.ts b/api/@ohos.application.abilityDelegatorRegistry.d.ts index cd7a48c6b1..ad936320c5 100644 --- a/api/@ohos.application.abilityDelegatorRegistry.d.ts +++ b/api/@ohos.application.abilityDelegatorRegistry.d.ts @@ -13,8 +13,10 @@ * limitations under the License. */ -import { AbilityDelegator } from './application/abilityDelegator'; -import { AbilityDelegatorArgs } from './application/abilityDelegatorArgs'; +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'; /** * A global register used to store the AbilityDelegator and AbilityDelegatorArgs objects registered @@ -57,6 +59,43 @@ declare namespace abilityDelegatorRegistry { BACKGROUND, DESTROY, } + + /** + * A global test utility interface used for adding AbilityMonitor objects and control lifecycle states of abilities. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @import import AbilityDelegator from 'application/abilityDelegator.d' + */ + export type AbilityDelegator = _AbilityDelegator + + /** + * Store unit testing-related parameters, including test case names, and test runner name. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @import import AbilityDelegatorArgs from 'application/abilityDelegatorArgs.d' + */ + export type AbilityDelegatorArgs = _AbilityDelegatorArgs + + /** + * Provide methods for matching monitored Ability objects that meet specified conditions. + * The most recently matched Ability objects will be saved in the AbilityMonitor object. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @import import AbilityMonitor from 'application/abilityMonitor.d' + */ + export type AbilityMonitor = _AbilityMonitor + + /** + * A object that records the result of shell command executes. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @import import ShellCmdResult from 'application/shellCmdResult.d' + */ + export type ShellCmdResult = _ShellCmdResult } export default abilityDelegatorRegistry; \ No newline at end of file diff --git a/api/@ohos.application.abilityManager.d.ts b/api/@ohos.application.abilityManager.d.ts index 1546b095a4..a7a44ce1e9 100644 --- a/api/@ohos.application.abilityManager.d.ts +++ b/api/@ohos.application.abilityManager.d.ts @@ -15,8 +15,8 @@ import { AsyncCallback } from './basic'; import { Configuration } from './@ohos.application.Configuration'; -import { AbilityRunningInfo } from './application/AbilityRunningInfo'; -import { ExtensionRunningInfo } from './application/ExtensionRunningInfo'; +import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; +import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; import { ElementName } from './bundle/elementName'; /** @@ -91,6 +91,24 @@ declare namespace abilityManager { */ function getTopAbility(): Promise; function getTopAbility(callback: AsyncCallback): void; + + /** + * The class of an ability running information. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi hide this for inner system use + */ + export type AbilityRunningInfo = _AbilityRunningInfo + + /** + * The class of an extension running information. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi hide this for inner system use + */ + export type ExtensionRunningInfo = _ExtensionRunningInfo } export default abilityManager; \ No newline at end of file diff --git a/api/@ohos.application.appManager.d.ts b/api/@ohos.application.appManager.d.ts index a116e01990..09fa21815a 100644 --- a/api/@ohos.application.appManager.d.ts +++ b/api/@ohos.application.appManager.d.ts @@ -14,9 +14,11 @@ */ import { AsyncCallback } from './basic'; -import ApplicationStateObserver from './application/ApplicationStateObserver'; -import AppStateData from './application/AppStateData'; -import { ProcessRunningInfo } from './application/ProcessRunningInfo'; +import * as _ApplicationStateObserver from './application/ApplicationStateObserver'; +import * as _AbilityStateData from './application/AbilityStateData'; +import * as _AppStateData from './application/AppStateData'; +import * as _ProcessData from './application/ProcessData'; +import { ProcessRunningInfo as _ProcessRunningInfo } from './application/ProcessRunningInfo'; /** * This module provides the function of app manager service. @@ -139,6 +141,59 @@ declare namespace appManager { */ function getAppMemorySize(): Promise; function getAppMemorySize(callback: AsyncCallback): void; + + /** + * The ability or extension state data. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi hide for inner use. + */ + export type AbilityStateData = _AbilityStateData.default + + /** + * The application state data. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi hide for inner use. + */ + export type AppStateData = _AppStateData.default + + /** + * The application state observer. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi hide for inner use. + */ + export type ApplicationStateObserver = _ApplicationStateObserver.default + + /** + * The process data. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Mission + * @systemapi hide for inner use. + */ + export type ProcessData = _ProcessData.default + + /** + * The class of an process running information. + * + * @deprecated since 9 + * @since 8 + * @syscap SystemCapability.Ability.AbilityRuntime.Mission + * @permission N/A + */ + /** + * The class of an process running information. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @permission N/A + */ + export type ProcessRunningInfo = _ProcessRunningInfo } export default appManager; diff --git a/api/@ohos.application.context.d.ts b/api/@ohos.application.context.d.ts index b08a47da80..bdfa442e97 100755 --- a/api/@ohos.application.context.d.ts +++ b/api/@ohos.application.context.d.ts @@ -20,6 +20,9 @@ import * as _BaseContext from './application/BaseContext'; import * as _Context from './application/Context'; import * as _ExtensionContext from './application/ExtensionContext'; import * as _FormExtensionContext from './application/FormExtensionContext'; +import { AreaMode as _AreaMode } from './application/Context'; +import * as _EventHub from './application/EventHub'; +import * as _PermissionRequestResult from './application/PermissionRequestResult'; /** * The context of an application. It allows access to application-specific resources. @@ -94,6 +97,33 @@ declare namespace context { * @StageModelOnly */ export type FormExtensionContext = _FormExtensionContext.default + + /** + * File area mode + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @StageModelOnly + */ + export type AreaMode = _AreaMode + + /** + * The event center of a context, support the subscription and publication of events. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @StageModelOnly + */ + export type EventHub = _EventHub.default + + /** + * The result of requestPermissionsFromUser with asynchronous callback. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @StageModelOnly + */ + export type PermissionRequestResult = _PermissionRequestResult.default } export default context; \ No newline at end of file diff --git a/api/@ohos.application.errorManager.d.ts b/api/@ohos.application.errorManager.d.ts index 490cac91f4..dda4361c79 100644 --- a/api/@ohos.application.errorManager.d.ts +++ b/api/@ohos.application.errorManager.d.ts @@ -14,7 +14,7 @@ */ import { AsyncCallback } from './basic'; -import ErrorObserver from './application/ErrorObserver'; +import * as _ErrorObserver from './application/ErrorObserver'; /** * This module provides the function of error manager. @@ -46,6 +46,14 @@ declare namespace errorManager { */ function unregisterErrorObserver(observerId: number, callback: AsyncCallback): void; function unregisterErrorObserver(observerId: number): Promise; + + /** + * The observer will be called by system when an error occurs. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + */ + export type ErrorObserver = _ErrorObserver.default } export default errorManager; diff --git a/api/@ohos.application.missionManager.d.ts b/api/@ohos.application.missionManager.d.ts index 6506633bca..3f43e85ddc 100644 --- a/api/@ohos.application.missionManager.d.ts +++ b/api/@ohos.application.missionManager.d.ts @@ -14,9 +14,9 @@ */ import { AsyncCallback } from './basic'; -import { MissionInfo } from './application/MissionInfo'; -import { MissionListener } from './application/MissionListener'; -import { MissionSnapshot } from './application/MissionSnapshot'; +import { MissionInfo as _MissionInfo } from './application/MissionInfo'; +import { MissionListener as _MissionListener } from './application/MissionListener'; +import { MissionSnapshot as _MissionSnapshot } from './application/MissionSnapshot'; import StartOptions from "./@ohos.application.StartOptions"; /** @@ -153,6 +153,34 @@ declare namespace missionManager { function moveMissionToFront(missionId: number, callback: AsyncCallback): void; function moveMissionToFront(missionId: number, options: StartOptions, callback: AsyncCallback): void; function moveMissionToFront(missionId: number, options?: StartOptions): Promise; + + /** + * Mission information corresponding to ability. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Mission + * @systemapi hide for inner use. + */ + export type MissionInfo = _MissionInfo + + /** + * MissionListener registered by app. + * + * @name MissionListener + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Mission + * @systemapi hide for inner use. + */ + export type MissionListener = _MissionListener + + /** + * Mission snapshot corresponding to mission. + * + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Mission + * @systemapi hide for inner use. + */ + export type MissionSnapshot = _MissionSnapshot } export default missionManager; \ No newline at end of file diff --git a/api/@ohos.wantAgent.d.ts b/api/@ohos.wantAgent.d.ts index 5660d49567..28777bbadc 100644 --- a/api/@ohos.wantAgent.d.ts +++ b/api/@ohos.wantAgent.d.ts @@ -15,8 +15,8 @@ import { AsyncCallback , Callback} from './basic'; import Want from './@ohos.application.want'; -import { WantAgentInfo } from './wantAgent/wantAgentInfo'; -import { TriggerInfo } from './wantAgent/triggerInfo'; +import { WantAgentInfo as _WantAgentInfo } from './wantAgent/wantAgentInfo'; +import { TriggerInfo as _TriggerInfo } from './wantAgent/triggerInfo'; /** * Provide the method obtain trigger, cancel, and compare and to obtain @@ -229,6 +229,24 @@ declare namespace wantAgent { */ extraInfo?: {[key: string]: any}; } + + /** + * Provides the information required for triggering a WantAgent. + * + * @name TriggerInfo + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + */ + export type TriggerInfo = _TriggerInfo + + /** + * Provides the information required for triggering a WantAgent. + * + * @name WantAgentInfo + * @since 9 + * @syscap SystemCapability.Ability.AbilityRuntime.Core + */ + export type WantAgentInfo = _WantAgentInfo } /** diff --git a/api/ability/want.d.ts b/api/ability/want.d.ts index 7a0de81e06..ff0cdfde5e 100644 --- a/api/ability/want.d.ts +++ b/api/ability/want.d.ts @@ -19,6 +19,7 @@ * @since 6 * @syscap SystemCapability.Ability.AbilityBase * @permission N/A + * @deprecated */ export declare interface Want { /** -- Gitee From 3ac546eaf74c8d874f93dd57a250e0858e06b5c0 Mon Sep 17 00:00:00 2001 From: m00512953 Date: Sat, 9 Jul 2022 14:16:26 +0800 Subject: [PATCH 05/30] mingxihua@huawei.com.cn Signed-off-by: m00512953 --- api/ability/want.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/ability/want.d.ts b/api/ability/want.d.ts index ff0cdfde5e..51e6579928 100644 --- a/api/ability/want.d.ts +++ b/api/ability/want.d.ts @@ -19,7 +19,7 @@ * @since 6 * @syscap SystemCapability.Ability.AbilityBase * @permission N/A - * @deprecated + * @deprecated since 9 */ export declare interface Want { /** -- Gitee From 3a69fc58ee1fda32a1fed73340e2933f50946c29 Mon Sep 17 00:00:00 2001 From: kangchongtao Date: Sat, 9 Jul 2022 16:33:21 +0800 Subject: [PATCH 06/30] =?UTF-8?q?=E5=AE=8C=E5=96=84gridRow=EF=BC=8CgridCol?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=85=A5=E5=8F=82=E5=8F=AF=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=A2=9E=E5=8A=A0GridCol=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangchongtao Change-Id: I0b2c5ad5751d9cb4b2501c03234721e503617705 --- api/@internal/component/ets/grid_col.d.ts | 26 +++++++++++++++++++---- api/@internal/component/ets/grid_row.d.ts | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/api/@internal/component/ets/grid_col.d.ts b/api/@internal/component/ets/grid_col.d.ts index 82f2162292..cb493ec093 100644 --- a/api/@internal/component/ets/grid_col.d.ts +++ b/api/@internal/component/ets/grid_col.d.ts @@ -64,19 +64,19 @@ declare interface GridColOptions { * Sets the span of current gird-container item. * @since 9 */ - span?: GridColColumnOption; + span?: number | GridColColumnOption; /** * Sets the offset of current gird-container item. * @since 9 */ - offset?: GridColColumnOption; + offset?: number | GridColColumnOption; /** * Sets the order of current gird-container item. * @since 9 */ - order?: GridColColumnOption; + order?: number | GridColColumnOption; } @@ -92,7 +92,25 @@ interface GridColInterface { (optiion?: GridColOptions): GridColAttribute; } -declare class GridColAttribute extends CommonMethod {} +declare class GridColAttribute extends CommonMethod { + /** + * Sets the span of current gird-container item. + * @since 9 + */ + span(value: number | GridColColumnOption): GridRowAttribute; + + /** + * Sets the offset of current gird-container item. + * @since 9 + */ + offset(value: number | GridColColumnOption): GridRowAttribute; + + /** + * Sets the order of current gird-container item. + * @since 9 + */ + order(value: number | GridColColumnOption): GridRowAttribute; +} declare const GridCol: GridColInterface declare const GridColInstance: GridColAttribute; \ No newline at end of file diff --git a/api/@internal/component/ets/grid_row.d.ts b/api/@internal/component/ets/grid_row.d.ts index 8ce36fd362..4105a105f3 100644 --- a/api/@internal/component/ets/grid_row.d.ts +++ b/api/@internal/component/ets/grid_row.d.ts @@ -179,7 +179,7 @@ declare interface GridRowOptions { * grid-container layout column spacing. * @since 9 */ - gutter?: GetterOption; + gutter?: Length | GetterOption; /** * Sets the total number of columns in the current layout. -- Gitee From 57d43aea79c38e8148d87636adf966e28fd89ebd Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 10 Jul 2022 10:46:43 +0800 Subject: [PATCH 07/30] update comments for api9 0710 Signed-off-by: yanxiaotao --- api/@ohos.wifi.d.ts | 72 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 61 insertions(+), 11 deletions(-) diff --git a/api/@ohos.wifi.d.ts b/api/@ohos.wifi.d.ts index 21ad360b00..549cfd2cdf 100644 --- a/api/@ohos.wifi.d.ts +++ b/api/@ohos.wifi.d.ts @@ -1070,8 +1070,13 @@ declare namespace wifi { /* @systemapi */ staticIp: IpConfig; - /** EAP config info */ - /* @systemapi */ + /** + * EAP config info. + * + * @since 9 + * @systemapi + * @syscap SystemCapability.Communication.WiFi.STA + */ eapConfig: WifiEapConfig; } @@ -1149,13 +1154,28 @@ declare namespace wifi { /** Channel width */ channelWidth: number; - /** Center frequency */ + /** + * Center frequency 0. + * + * @since 9 + * @syscap SystemCapability.Communication.WiFi.STA + */ centerFrequency0: number; - /** Center frequency */ + /** + * Center frequency 1. + * + * @since 9 + * @syscap SystemCapability.Communication.WiFi.STA + */ centerFrequency1: number; - /** Information elements */ + /** + * Information elements. + * + * @since 9 + * @syscap SystemCapability.Communication.WiFi.STA + */ infoElems: Array; /** Time stamp */ @@ -1184,19 +1204,44 @@ declare namespace wifi { /** Simultaneous Authentication of Equals (SAE) */ WIFI_SEC_TYPE_SAE = 4, - /** EAP authentication */ + /** + * EAP authentication. + * + * @since 9 + * @syscap SystemCapability.Communication.WiFi.Core + */ WIFI_SEC_TYPE_EAP = 5, - /** SUITE_B_192 192 bit level */ + /** + * SUITE_B_192 192 bit level. + * + * @since 9 + * @syscap SystemCapability.Communication.WiFi.Core + */ WIFI_SEC_TYPE_EAP_SUITE_B = 6, - /** Opportunististic Wireless Encryption */ + /** + * Opportunististic Wireless Encryption. + * + * @since 9 + * @syscap SystemCapability.Communication.WiFi.Core + */ WIFI_SEC_TYPE_OWE = 7, - /** WAPI certificate to be specified */ + /** + * WAPI certificate to be specified. + * + * @since 9 + * @syscap SystemCapability.Communication.WiFi.Core + */ WIFI_SEC_TYPE_WAPI_CERT = 8, - /** WAPI pre-shared key to be specified */ + /** + * WAPI pre-shared key to be specified. + * + * @since 9 + * @syscap SystemCapability.Communication.WiFi.Core + */ WIFI_SEC_TYPE_WAPI_PSK = 9, } @@ -1243,7 +1288,12 @@ declare namespace wifi { /* @systemapi */ snr: number; - /** Type of macAddress: 0 - real mac, 1 - random mac. */ + /** + * Type of macAddress: 0 - real mac, 1 - random mac. + * + * @since 9 + * @syscap SystemCapability.Communication.WiFi.STA + */ macType: number; /** The Wi-Fi MAC address of a device. */ -- Gitee From 6c3c025fcff222b35ee599c35864fc875eadbc46 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 10 Jul 2022 10:51:58 +0800 Subject: [PATCH 08/30] update comments for api9 0710 Signed-off-by: yanxiaotao --- api/@ohos.wifi.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/@ohos.wifi.d.ts b/api/@ohos.wifi.d.ts index 549cfd2cdf..ceba8186e9 100644 --- a/api/@ohos.wifi.d.ts +++ b/api/@ohos.wifi.d.ts @@ -1074,7 +1074,7 @@ declare namespace wifi { * EAP config info. * * @since 9 - * @systemapi + * @systemapi * @syscap SystemCapability.Communication.WiFi.STA */ eapConfig: WifiEapConfig; -- Gitee From 14d65107bf421f5ee472bccbf825d3eb2bc67114 Mon Sep 17 00:00:00 2001 From: m00512953 Date: Mon, 11 Jul 2022 10:59:38 +0800 Subject: [PATCH 09/30] mingxihua@huawei.com.cn Signed-off-by: m00512953 --- ...s.ability.Ability.d.ts => @ohos.ability.ability.d.ts} | 4 ++-- api/@ohos.application.appManager.d.ts | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) rename api/{@ohos.ability.Ability.d.ts => @ohos.ability.ability.d.ts} (98%) diff --git a/api/@ohos.ability.Ability.d.ts b/api/@ohos.ability.ability.d.ts similarity index 98% rename from api/@ohos.ability.Ability.d.ts rename to api/@ohos.ability.ability.d.ts index 00e65dc266..44be58f12e 100755 --- a/api/@ohos.ability.Ability.d.ts +++ b/api/@ohos.ability.ability.d.ts @@ -28,7 +28,7 @@ import { StartAbilityParameter as _StartAbilityParameter } from './ability/star * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @StageModelOnly */ -declare namespace Ability { +declare namespace ability { /** * DataAbilityHelper @@ -79,4 +79,4 @@ declare namespace Ability { export type StartAbilityParameter = _StartAbilityParameter } -export default Ability; \ No newline at end of file +export default ability; \ No newline at end of file diff --git a/api/@ohos.application.appManager.d.ts b/api/@ohos.application.appManager.d.ts index 09fa21815a..753939eebb 100644 --- a/api/@ohos.application.appManager.d.ts +++ b/api/@ohos.application.appManager.d.ts @@ -178,20 +178,11 @@ declare namespace appManager { */ export type ProcessData = _ProcessData.default - /** - * The class of an process running information. - * - * @deprecated since 9 - * @since 8 - * @syscap SystemCapability.Ability.AbilityRuntime.Mission - * @permission N/A - */ /** * The class of an process running information. * * @since 9 * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @permission N/A */ export type ProcessRunningInfo = _ProcessRunningInfo } -- Gitee From 0b6b06a5c5c4e66f404f2bb437fca19466c80967 Mon Sep 17 00:00:00 2001 From: liu-binjun Date: Mon, 11 Jul 2022 22:04:33 +0800 Subject: [PATCH 10/30] bugfix:Correct spelling mistakes Signed-off-by: liu-binjun --- api/@ohos.geolocation.d.ts | 39 +++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/api/@ohos.geolocation.d.ts b/api/@ohos.geolocation.d.ts index 56c14d6488..d8a755e11c 100644 --- a/api/@ohos.geolocation.d.ts +++ b/api/@ohos.geolocation.d.ts @@ -305,7 +305,7 @@ declare namespace geolocation { function sendCommand(command: LocationCommand) : Promise; /** - * Obtain the current country code. + * obtain the current country code. * * @since 9 * @syscap SystemCapability.Location.Location.Core @@ -321,19 +321,23 @@ declare namespace geolocation { * @syscap SystemCapability.Location.Location.Core * @systemapi * @param scenario Indicates the scenarios where location simulation is required. - * @param callback Indicates whether the position simulation function is enabled. + * @param callback Indicates a callback function, which is used to report the result + * of enabling the location simulation function. If the enabling fails, the error message will + * be carried in the first parameter err of AsyncCallback, If enabling succeeds, no data will be returned. */ function enableLocationMock(scenario?: LocationRequestScenario, callback: AsyncCallback) : void; function enableLocationMock(scenario?: LocationRequestScenario) : Promise; /** - * diable the geographical location simulation function. + * disable the geographical location simulation function. * * @since 9 * @syscap SystemCapability.Location.Location.Core * @systemapi * @param scenario Indicates the scenarios where location simulation is required. - * @param callback Indicates whether the position simulation function is enabled. + * @param callback Indicates a callback function, which is used to report the result + * of disabling the location simulation function. If the disabling fails, the error message will + * be carried in the first parameter err of AsyncCallback, If disabling succeeds, no data will be returned. */ function disableLocationMock(scenario?: LocationRequestScenario, callback: AsyncCallback) : void; function disableLocationMock(scenario?: LocationRequestScenario) : Promise; @@ -345,7 +349,9 @@ declare namespace geolocation { * @syscap SystemCapability.Location.Location.Core * @systemapi * @param config Indicates the configuration parameters for location simulation. - * @param callback Indicates whether the parameters of the location simulation function are set successfully. + * @param callback Indicates a callback function, which is used to report the result of setting + * the simulation locations. If the setting fails, the error message will be carried in the first + * parameter err of AsyncCallback. If the setting succeeds, no data will be returned. */ function setMockedLocations(config: LocationMockConfig, callback: AsyncCallback) : void; function setMockedLocations(config: LocationMockConfig) : Promise; @@ -356,7 +362,9 @@ declare namespace geolocation { * @since 9 * @syscap SystemCapability.Location.Location.Core * @systemapi - * @param callback Indicates whether the reverse geocoding simulation function is enabled. + * @param callback Indicates a callback function, which is used to report the result + * of enabling the reverse geocode simulation function. If the enabling fails, the error message will + * be carried in the first parameter err of AsyncCallback, If enabling succeeds, no data will be returned. */ function enableReverseGeocodingMock(callback: AsyncCallback) : void; function enableReverseGeocodingMock() : Promise; @@ -367,7 +375,9 @@ declare namespace geolocation { * @since 9 * @syscap SystemCapability.Location.Location.Core * @systemapi - * @param callback Indicates whether the reverse geocoding simulation function is enabled. + * @param callback Indicates a callback function, which is used to report the result + * of disabling the reverse geocode simulation function. If the disabling fails, the error message will + * be carried in the first parameter err of AsyncCallback, If disabling succeeds, no data will be returned. */ function disableReverseGeocodingMock(callback: AsyncCallback) : void; function disableReverseGeocodingMock() : Promise; @@ -379,7 +389,10 @@ declare namespace geolocation { * @syscap SystemCapability.Location.Location.Core * @systemapi * @param mockInfos Indicates the set of locations and place names to be simulated. - * @param callback Indicates whether the parameters of the reverse geocoding simulation are set successfully. + * @param callback Indicates a callback function, which is used to report the result of setting + * the configuration parameters for simulating reverse geocoding. If the setting fails, + * the error message will be carried in the first parameter err of AsyncCallback. + * If the setting succeeds, no data will be returned. */ function setReverseGeocodingMockInfo(mockInfos: Array, callback: AsyncCallback) : void; function setReverseGeocodingMockInfo(mockInfos: Array) : Promise; @@ -631,7 +644,7 @@ declare namespace geolocation { addressUrl?: string; /** - * Indicates the amount of additional descriptive information. + * Indicates additional information. * @since 7 */ descriptions?: Array; @@ -751,7 +764,7 @@ declare namespace geolocation { additionSize?: number; /** - * Indicates whether it is an mock GeoAddress + * Indicates whether it is an mock location. * @since 9 */ isFromMock: Boolean; @@ -797,7 +810,7 @@ declare namespace geolocation { export enum GeoLocationErrorCode { /** * Indicates function not supported. - * @since 7 + * @since 9 */ NOT_SUPPORTED = 100, @@ -826,13 +839,13 @@ declare namespace geolocation { LOCATOR_ERROR, /** - * Indicates operation failure caused by abnormal position switch. + * Indicates operation failure caused by abnormal location switch. * @since 7 */ LOCATION_SWITCH_ERROR, /** - * Indicates failed to get the last cache location. + * Indicates failed to get the last known location. * @since 7 */ LAST_KNOWN_LOCATION_ERROR, -- Gitee From 95c731aa196c96c633ab356d7af4ccde570f87b5 Mon Sep 17 00:00:00 2001 From: wangkai Date: Tue, 12 Jul 2022 15:27:37 +0800 Subject: [PATCH 11/30] context change Signed-off-by: wangkai --- api/@ohos.data.distributedData.d.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/api/@ohos.data.distributedData.d.ts b/api/@ohos.data.distributedData.d.ts index b69caae78a..9dc938384c 100644 --- a/api/@ohos.data.distributedData.d.ts +++ b/api/@ohos.data.distributedData.d.ts @@ -57,7 +57,6 @@ declare namespace distributedData { * @syscap SystemCapability.DistributedDataManager.KVStore.Core * @import N/A * @Note: if swap the area, you should close all the KV store and use the new Context to create the KVManager - * @StageModelOnly */ context: Context; } -- Gitee From c3e4b0c91763ccbaa7003078601f2ca86aea54f5 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 12 Jul 2022 15:45:46 +0800 Subject: [PATCH 12/30] =?UTF-8?q?IssueNo:#I5GP89=20=E4=BF=AE=E5=A4=8Dveris?= =?UTF-8?q?on=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=20Desc?= =?UTF-8?q?ription:=E4=BF=AE=E5=A4=8Dverison=E6=8B=BC=E5=86=99=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=20Sig:SIG=5FApplicaitonFramework=20?= =?UTF-8?q?Feature=20or=20Bugfix:Bugfix=20Binary=20Source:No?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dy --- api/bundle/dispatchInfo.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/bundle/dispatchInfo.d.ts b/api/bundle/dispatchInfo.d.ts index 641b8b170d..2538eb4c83 100644 --- a/api/bundle/dispatchInfo.d.ts +++ b/api/bundle/dispatchInfo.d.ts @@ -25,7 +25,7 @@ * @since 9 * @syscap SystemCapability.BundleManager.BundleFramework */ - readonly verison: string; + readonly version: string; /** * @default Indicates the free install interface version number -- Gitee From e8c45e3335fbb4300c240d4c93bbfc05e8178062 Mon Sep 17 00:00:00 2001 From: xiongjun_gitee Date: Wed, 13 Jul 2022 15:05:13 +0800 Subject: [PATCH 13/30] onHttpAuthRequest add host realm Signed-off-by: xiongjun_gitee --- api/@internal/component/ets/web.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/@internal/component/ets/web.d.ts b/api/@internal/component/ets/web.d.ts index f2b0c93a3a..ffb8faf6bc 100644 --- a/api/@internal/component/ets/web.d.ts +++ b/api/@internal/component/ets/web.d.ts @@ -342,7 +342,7 @@ declare class HitTestValue { * Defines the http auth request result, related to {@link onHttpAuthRequest} method. * @since 9 */ -declare class WebHttpAuthResult { +declare class HttpAuthHandler { /** * Constructor. * @since 9 @@ -1364,7 +1364,7 @@ declare class WebAttribute extends CommonMethod { * * @since 9 */ - onHttpAuthRequest(callback: (event?: { result: WebHttpAuthResult }) => boolean): WebAttribute; + onHttpAuthRequest(callback: (event?: { handler: HttpAuthHandler, host: string, realm: string }) => boolean): WebAttribute; /** * Triggered when the resouces loading is intercepted. -- Gitee From 73046106f58bb395618b8f756d4d3fb8432c1c7e Mon Sep 17 00:00:00 2001 From: zhouke Date: Thu, 14 Jul 2022 10:47:32 +0800 Subject: [PATCH 14/30] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=83=BD=E5=8A=9B=E8=AF=B4=E6=98=8E.Signed-o?= =?UTF-8?q?ff-by:=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouke --- api/@ohos.uitest.d.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api/@ohos.uitest.d.ts b/api/@ohos.uitest.d.ts index 237ac9e789..2c2e3fb4f3 100644 --- a/api/@ohos.uitest.d.ts +++ b/api/@ohos.uitest.d.ts @@ -15,7 +15,7 @@ /** * Resize direction for the window. - * + * @syscap SystemCapability.Test.UiTest * @since 9 */ enum ResizeDirection{ @@ -30,7 +30,7 @@ } /** * Enumerates the string value match pattern. - * + * @syscap SystemCapability.Test.UiTest * @since 8 */ enum MatchPattern{ @@ -66,7 +66,7 @@ /** * Describes the window mode of the tested window - * + * @syscap SystemCapability.Test.UiTest * @since 9 */ enum WindowMode{ @@ -78,7 +78,7 @@ /** * Represents the point on the device screen. - * + * @syscap SystemCapability.Test.UiTest * @since 9 */ declare interface Point { @@ -88,7 +88,7 @@ declare interface Point { /** * Represents the rectangle area on the device screen. - * + * @syscap SystemCapability.Test.UiTest * @since 9 */ declare interface Rect { @@ -100,7 +100,7 @@ declare interface Rect { /** * Represents filer condition to get the window . - * + * @syscap SystemCapability.Test.UiTest * @since 9 */ declare interface WindowFilter { @@ -112,7 +112,7 @@ declare interface WindowFilter { /** * Describes the attribute requirements for the target UiComponents. - * + * * @since 8 * @syscap SystemCapability.Test.UiTest */ -- Gitee From 19eca45d59cf378a8c0cf12ce290f3069f84bed3 Mon Sep 17 00:00:00 2001 From: zhouke Date: Thu, 14 Jul 2022 10:49:28 +0800 Subject: [PATCH 15/30] modify.Signed-off-by: . Signed-off-by: zhouke --- api/@ohos.uitest.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/@ohos.uitest.d.ts b/api/@ohos.uitest.d.ts index 2c2e3fb4f3..1e88f91157 100644 --- a/api/@ohos.uitest.d.ts +++ b/api/@ohos.uitest.d.ts @@ -112,7 +112,7 @@ declare interface WindowFilter { /** * Describes the attribute requirements for the target UiComponents. - * + * * @since 8 * @syscap SystemCapability.Test.UiTest */ -- Gitee From 75b463384c5a0b4c880b537ccfc7e6fcd9827b18 Mon Sep 17 00:00:00 2001 From: kangchongtao Date: Fri, 15 Jul 2022 15:58:49 +0800 Subject: [PATCH 16/30] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9A=82=E6=9C=AA?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangchongtao Change-Id: I51d1bf8fdb7d25e8b610efb23139408168e61c50 --- api/@internal/component/ets/grid_row.d.ts | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/api/@internal/component/ets/grid_row.d.ts b/api/@internal/component/ets/grid_row.d.ts index 4105a105f3..7418da6909 100644 --- a/api/@internal/component/ets/grid_row.d.ts +++ b/api/@internal/component/ets/grid_row.d.ts @@ -214,18 +214,6 @@ interface GridRowInterface { } declare class GridRowAttribute extends CommonMethod { - /** - * Set the alignment of sub components in the vertical direction - * @since 9 - */ - verticalAlign(value: VerticalAlign): GridRowAttribute; - - /** - * Set the alignment of sub components in the horizontal direction - * @since 9 - */ - horizontalAlign(value: HorizontalAlign): GridRowAttribute; - /** * Callback triggered when the breakpoint changes * @since 9 -- Gitee From 7683e02bafb7dfb5cfa2950e55b516835639499d Mon Sep 17 00:00:00 2001 From: wangtiantian Date: Sat, 16 Jul 2022 11:28:40 +0800 Subject: [PATCH 17/30] IssueNo:#I5HE3P:fix bug Description: fix bug Sig:SIG_ApplicaitonFramework Feature or Bugfix:Bugfix Binary Source:No Signed-off-by: wangtiantian --- api/@ohos.bundle.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/@ohos.bundle.d.ts b/api/@ohos.bundle.d.ts index 0b2eff47d6..c27071385f 100644 --- a/api/@ohos.bundle.d.ts +++ b/api/@ohos.bundle.d.ts @@ -896,7 +896,7 @@ declare namespace bundle { * @systemapi Hide this for inner system use */ function setDisposedStatus(bundleName: string, status: number, callback: AsyncCallback): void; - function setDisposedStatus(bundleName: string, status: number,): Promise; + function setDisposedStatus(bundleName: string, status: number): Promise; /** * Obtains the disposed status of a specified bundle. -- Gitee From 344313a5499dc58e59c02a680d42ec8ba7d0cbd8 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 18 Jul 2022 10:17:41 +0800 Subject: [PATCH 18/30] add user Signed-off-by: unknown --- api/application/ExtensionContext.d.ts | 1 + api/application/ServiceExtensionContext.d.ts | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/api/application/ExtensionContext.d.ts b/api/application/ExtensionContext.d.ts index c265080057..3e20d41b8e 100644 --- a/api/application/ExtensionContext.d.ts +++ b/api/application/ExtensionContext.d.ts @@ -16,6 +16,7 @@ import { HapModuleInfo } from "../bundle/hapModuleInfo"; import { Configuration } from '../@ohos.application.Configuration'; import Context from "./Context"; +import { ExtensionAbilityInfo } from "../bundle/extensionAbilityInfo"; /** * The context of an extension. It allows access to extension-specific resources. diff --git a/api/application/ServiceExtensionContext.d.ts b/api/application/ServiceExtensionContext.d.ts index ee956cba6d..87bfcc90b7 100644 --- a/api/application/ServiceExtensionContext.d.ts +++ b/api/application/ServiceExtensionContext.d.ts @@ -18,7 +18,6 @@ import { ConnectOptions } from "../ability/connectOptions"; import ExtensionContext from "./ExtensionContext"; import Want from "../@ohos.application.Want"; import StartOptions from "../@ohos.application.StartOptions"; -import { ExtensionAbilityInfo } from "../bundle/extensionAbilityInfo"; /** * The context of service extension. It allows access to -- Gitee From adda9327e96530af0c280813f874df52b6f6a019 Mon Sep 17 00:00:00 2001 From: fengzewu Date: Mon, 18 Jul 2022 14:32:11 +0800 Subject: [PATCH 19/30] change version from since 8 to since 9 Signed-off-by: fengzewu --- api/@ohos.multimedia.image.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/@ohos.multimedia.image.d.ts b/api/@ohos.multimedia.image.d.ts index 682810e42a..6564ea82b2 100644 --- a/api/@ohos.multimedia.image.d.ts +++ b/api/@ohos.multimedia.image.d.ts @@ -518,14 +518,14 @@ declare namespace image { /** * PixelMap expected format. - * @since 8 + * @since 9 * @syscap SystemCapability.Multimedia.Image.Core */ sourcePixelFormat?: PixelMapFormat; /** * PixelMap size. - * @since 8 + * @since 9 * @syscap SystemCapability.Multimedia.Image.Core */ sourceSize?: Size; -- Gitee From a342188826dc55814e3e004b3b3d2c4ec09ab169 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Wed, 13 Jul 2022 14:30:19 +0800 Subject: [PATCH 20/30] add accessibility config system api Signed-off-by: laiguizhong Change-Id: Ic4dd4a8a66efc2634abce50f9213d2c111d0ece7 --- api/@ohos.accessibility.config.d.ts | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 api/@ohos.accessibility.config.d.ts diff --git a/api/@ohos.accessibility.config.d.ts b/api/@ohos.accessibility.config.d.ts new file mode 100644 index 0000000000..d7d3632e72 --- /dev/null +++ b/api/@ohos.accessibility.config.d.ts @@ -0,0 +1,42 @@ +/* + * 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. + */ + +import accessibility from './@ohos.accessibility'; +import { AsyncCallback } from './basic'; + +/** + * Configuration of the accessibility. + * + * @since 9 + * @syscap SystemCapability.BarrierFree.Accessibility.Core + * @systemapi + */ +declare namespace config { + /** + * Enable the acceessibility extension ability. + * @param name Indicates the accessibility extension name, in "bundleName/abilityName" format. + * @param capability Indicates the ability. + */ + function enableAbility(name: string, capability: Array): Promise; + function enableAbility(name: string, capability: Array, callback: AsyncCallback): void; + + /** + * Disable the acceessibility extension ability. + * @param name Indicates the accessibility extension name, in "bundleName/abilityName" format. + */ + function disableAbility(name: string): Promise; + function disableAbility(name: string, callback: AsyncCallback): void; +} +export default config; \ No newline at end of file -- Gitee From 81503092b915145e8b3f625b505c83ec98878d09 Mon Sep 17 00:00:00 2001 From: m00512953 Date: Mon, 18 Jul 2022 17:16:41 +0800 Subject: [PATCH 21/30] mingxihua@huawei.com.cn Signed-off-by: m00512953 --- api/@ohos.application.context.d.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/api/@ohos.application.context.d.ts b/api/@ohos.application.context.d.ts index bdfa442e97..cae84c127a 100755 --- a/api/@ohos.application.context.d.ts +++ b/api/@ohos.application.context.d.ts @@ -20,7 +20,6 @@ import * as _BaseContext from './application/BaseContext'; import * as _Context from './application/Context'; import * as _ExtensionContext from './application/ExtensionContext'; import * as _FormExtensionContext from './application/FormExtensionContext'; -import { AreaMode as _AreaMode } from './application/Context'; import * as _EventHub from './application/EventHub'; import * as _PermissionRequestResult from './application/PermissionRequestResult'; @@ -105,7 +104,16 @@ declare namespace context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly */ - export type AreaMode = _AreaMode + export enum AreaMode { + /** + * @syscap SystemCapability.Ability.AbilityRuntime.Core + */ + EL1 = 0, + /** + * @syscap SystemCapability.Ability.AbilityRuntime.Core + */ + EL2 = 1 + } /** * The event center of a context, support the subscription and publication of events. -- Gitee From 19b0ed966479326cde055f935441b0de4fb9dd71 Mon Sep 17 00:00:00 2001 From: huang-xl Date: Mon, 18 Jul 2022 21:08:02 +0800 Subject: [PATCH 22/30] player d.ts Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: I8832993e19894c22f65a2e7b0ecac0ac1be747b0 --- api/@ohos.multimedia.media.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/@ohos.multimedia.media.d.ts b/api/@ohos.multimedia.media.d.ts index c64a819c92..52a8dac9f4 100644 --- a/api/@ohos.multimedia.media.d.ts +++ b/api/@ohos.multimedia.media.d.ts @@ -1194,7 +1194,7 @@ declare namespace media { * @param type Type of the playback event to listen for. * @param callback Callback used to listen for the playback event return available bitrates. */ - on(type: 'availableBitratesCollected', callback: (bitrates: Array) => void): void + on(type: 'availableBitratesCollected', callback: (bitrates: Array) => void): void; /** * Listens for playback error events. @@ -1229,7 +1229,7 @@ declare namespace media { * @since 9 * @syscap SystemCapability.Multimedia.Media.VideoPlayer */ - VIDEO_SCALE_TYPE_FIT_CROP + VIDEO_SCALE_TYPE_FIT_CROP = 1, } /** -- Gitee From 09624fd3ab285cc69e09b900844928b8b2508c9c Mon Sep 17 00:00:00 2001 From: xuyong Date: Tue, 19 Jul 2022 12:00:09 +0800 Subject: [PATCH 23/30] Standardlize the documentation about hisysevent js api intefaces. Signed-off-by: xuyong --- api/@ohos.hiSysEvent.d.ts | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/api/@ohos.hiSysEvent.d.ts b/api/@ohos.hiSysEvent.d.ts index 77c93c4358..78bacbc279 100644 --- a/api/@ohos.hiSysEvent.d.ts +++ b/api/@ohos.hiSysEvent.d.ts @@ -23,7 +23,6 @@ import { AsyncCallback } from './basic'; * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @import import hiSysEvent from '@ohos.hiSysEvent' - * @permission ohos.permission.READ_DFX_SYSEVENT * @since 9 */ declare namespace hiSysEvent { @@ -77,7 +76,7 @@ declare namespace hiSysEvent { /** * Definition of written system event information. * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @since 9 */ @@ -106,7 +105,7 @@ declare namespace hiSysEvent { /** * Write system event. * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @static * @param {SysEventInfo} info system event information to be written. @@ -122,7 +121,7 @@ declare namespace hiSysEvent { * * @enum {number} * @readonly - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @since 9 */ @@ -130,7 +129,7 @@ declare namespace hiSysEvent { /** * whole word match * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @since 9 */ @@ -139,7 +138,7 @@ declare namespace hiSysEvent { /** * prefix match * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @since 9 */ @@ -148,7 +147,7 @@ declare namespace hiSysEvent { /** * regular match * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @since 9 */ @@ -158,7 +157,7 @@ declare namespace hiSysEvent { /** * Definition listener rule for system event information. * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @since 9 */ @@ -187,7 +186,7 @@ declare namespace hiSysEvent { /** * Definition wathcer for system event information. * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @since 9 */ @@ -200,7 +199,7 @@ declare namespace hiSysEvent { /** * receive system event. * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @param {SysEventInfo} info system event information of receive. * @return {void} return void. @@ -211,7 +210,7 @@ declare namespace hiSysEvent { /** * hisysevent service shutdown. * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @return {void} return void. * @since 9 @@ -224,7 +223,7 @@ declare namespace hiSysEvent { * * @enum {number} * @readonly - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @since 9 */ @@ -248,7 +247,7 @@ declare namespace hiSysEvent { /** * Definition event for query system event information * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @since 9 */ @@ -267,7 +266,7 @@ declare namespace hiSysEvent { /** * Definition query result handler * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @since 9 */ @@ -275,7 +274,7 @@ declare namespace hiSysEvent { /** * handle query result, the query result will be send in serval times. * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @param {SysEventInfo[]} infos system event information of query result. * @param {number[]} seqs sequeue of infos. @@ -287,7 +286,7 @@ declare namespace hiSysEvent { /** * notify Querier execute query has finished. * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @param {number} reason 0 success, 1 fail. * @param {number} total the total number of query result. @@ -300,7 +299,7 @@ declare namespace hiSysEvent { /** * add watcher to watch system event * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @permission ohos.permission.READ_DFX_SYSEVENT * @param {Watcher} watcher watch system event @@ -312,7 +311,7 @@ declare namespace hiSysEvent { /** * remove watcher * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @permission ohos.permission.READ_DFX_SYSEVENT * @param {Watcher} wathcer watch system event @@ -324,7 +323,7 @@ declare namespace hiSysEvent { /** * query system event * - * @syscap SystemCapability.HiviewDFX.hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use * @permission ohos.permission.READ_DFX_SYSEVENT * @param {QueryArg} queryArg common arguments of query system event -- Gitee From de0ee9894c06a365ae4cbfb4ad9930677afbd07b Mon Sep 17 00:00:00 2001 From: yangbo <1442420648@qq.com> Date: Thu, 14 Jul 2022 17:15:33 +0800 Subject: [PATCH 24/30] delete non-exsit import Signed-off-by: yangbo <1442420648@qq.com> Change-Id: I1e0be69712ee23405187d5ac9778e27c9cb8de7b --- build-tools/delete_systemapi_plugin.js | 119 ++++++++++++++++++++++++- 1 file changed, 118 insertions(+), 1 deletion(-) diff --git a/build-tools/delete_systemapi_plugin.js b/build-tools/delete_systemapi_plugin.js index fcf3223a4f..47a4ed31df 100644 --- a/build-tools/delete_systemapi_plugin.js +++ b/build-tools/delete_systemapi_plugin.js @@ -80,6 +80,115 @@ function writeFile(url, data, option) { } }) } + +function formatImportDeclaration(url) { + return (context) => { + const allIdentifierSet = new Set([]); + let copyrightMessage = ''; + let isCopyrightDeleted = false; + return (node) => { + sourceFile = node; + collectAllIdentifier(node); + node = formatAllNodes(node); + if (!isEmptyFile(node)) { + const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); + let result = printer.printNode(ts.EmitHint.Unspecified, node, sourceFile); + if (isCopyrightDeleted) { + result = copyrightMessage + '\n' + result; + } + writeFile(url, result); + } + return node; + } + function collectAllIdentifier(node) { + if (ts.isSourceFile(node) && node.statements) { + node.statements.forEach(stat => { + if (!ts.isImportDeclaration(stat)) { + ts.visitEachChild(stat, collectAllNodes, context); + } + }); + } + } + function collectAllNodes(node) { + if (ts.isIdentifier(node)) { + allIdentifierSet.add(node.escapedText.toString()); + } + return ts.visitEachChild(node, collectAllNodes, context); + } + function formatAllNodes(node) { + if (ts.isSourceFile(node) && node.statements) { + const newStatements = []; + node.statements.forEach(statement => { + if (ts.isImportDeclaration(statement)) { + const clauseSet = new Set([]); + if (statement.importClause && ts.isImportClause(statement.importClause)) { + const clauseNode = statement.importClause; + if (!clauseNode.namedBindings && clauseNode.name && ts.isIdentifier(clauseNode.name)) { + clauseSet.add(clauseNode.name.escapedText.toString()); + } else if (clauseNode.namedBindings && clauseNode.namedBindings.elements) { + clauseNode.namedBindings.elements.forEach(ele => { + if (ele.name && ts.isIdentifier(ele.name)) { + clauseSet.add(ele.name.escapedText.toString()); + } + }); + } + } + const importSpecifier = statement.moduleSpecifier.getText(); + const importSpecifierRealPath = path.resolve(url, `../${importSpecifier.replace(/[\'\"]/g, '')}.d.ts`); + if (fs.existsSync(importSpecifierRealPath) && clauseSet.size > 0) { + const clasueCheckList = []; + let exsitClauseSet = new Set([]); + for (const clause of clauseSet) { + if (allIdentifierSet.has(clause)) { + exsitClauseSet.add(clause); + clasueCheckList.push('exist'); + } else { + clasueCheckList.push('non-exist'); + } + } + let hasExsitStatus = false; + let hasNonExsitStatus = false; + clasueCheckList.forEach(ele => { + if (ele === 'exist') { + hasExsitStatus = true; + } else { + hasNonExsitStatus = true; + } + }); + if (hasExsitStatus) { + if (hasNonExsitStatus) { + const newSpecifiers = []; + statement.importClause.namedBindings.elements.forEach(element => { + if (exsitClauseSet.has(element.name.escapedText.toString())) { + newSpecifiers.push(element); + } + }); + statement.importClause.namedBindings = ts.factory.updateNamedImports( + statement.importClause.namedBindings, newSpecifiers); + } + newStatements.push(statement); + } else if (hasCopyright(statement)) { + copyrightMessage = node.getFullText().replace(node.getText(), ''); + isCopyrightDeleted = true; + } + } else if (hasCopyright(statement)) { + copyrightMessage = node.getFullText().replace(node.getText(), ''); + isCopyrightDeleted = true; + } + } else { + newStatements.push(statement); + } + }); + node = ts.factory.updateSourceFile(node, newStatements); + } + return node; + } + function hasCopyright(node) { + return /http\:\/\/www\.apache\.org\/licenses\/LICENSE\-2\.0/g.test(node.getFullText().replace(node.getText(), '')); + } + } +} + function deleteSystemApi(url) { return (context) => { return (node) => { @@ -89,7 +198,15 @@ function deleteSystemApi(url) { if (!isEmptyFile(node)) { const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); const result = printer.printNode(ts.EmitHint.Unspecified, node, sourceFile); - writeFile(url, result); + const fileName = path.basename(url).replace(/.d.ts/g, '.ts'); + ts.transpileModule(result, { + compilerOptions: { + "target": ts.ScriptTarget.ES2017 + }, + fileName: fileName, + transformers: { before: [formatImportDeclaration(url)] } + }); + // writeFile(url, result); } return node; } -- Gitee From 3542cfe1ca603ca8e2ab4182e8aef4e7826142b3 Mon Sep 17 00:00:00 2001 From: huang-xl Date: Tue, 19 Jul 2022 16:28:37 +0800 Subject: [PATCH 25/30] player d.ts Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: If822c2a7d128efa979998d36949d0ff1a5e8335e --- api/@ohos.multimedia.media.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/@ohos.multimedia.media.d.ts b/api/@ohos.multimedia.media.d.ts index 52a8dac9f4..9d9547f180 100644 --- a/api/@ohos.multimedia.media.d.ts +++ b/api/@ohos.multimedia.media.d.ts @@ -1118,7 +1118,7 @@ declare namespace media { /** * select a specified bitrate to playback, only valid for HLS protocal network stream. Defaulty, the * player will select the appropriate bitrate according to the network connection speed. The - * available bitrates list reported by {@link #on('availablebitratesCollected')}. Set it to select + * available bitrates list reported by {@link #on('availableBitratesCollect')}. Set it to select * a specified bitrate. If the specified bitrate is not in the list of available bitrates, the player * will select the minimal and closest one from the available bitrates list. * @since 9 @@ -1131,7 +1131,7 @@ declare namespace media { /** * select a specified bitrate to playback, only valid for HLS protocal network stream. Defaulty, the * player will select the appropriate bitrate according to the network connection speed. The - * available bitrates list reported by {@link #on('availablebitratesCollected')}. Set it to select + * available bitrates list reported by {@link #on('availableBitratesCollect')}. Set it to select * a specified bitrate. If the specified bitrate is not in the list of available bitrates, the player * will select the minimal and closest one from the available bitrates list. * @since 9 @@ -1194,7 +1194,7 @@ declare namespace media { * @param type Type of the playback event to listen for. * @param callback Callback used to listen for the playback event return available bitrates. */ - on(type: 'availableBitratesCollected', callback: (bitrates: Array) => void): void; + on(type: 'availableBitratesCollect', callback: (bitrates: Array) => void): void; /** * Listens for playback error events. -- Gitee From 5c4027a4c72b339f52c73e01315f66113eecfeb4 Mon Sep 17 00:00:00 2001 From: "zhangyafei.echo" Date: Wed, 20 Jul 2022 14:35:25 +0800 Subject: [PATCH 26/30] IssueNo:#I5HY5W Description:Change CaleeCallBack to CalleeCallBack Sig:SIG_ApplicationFramework Feature or BugFix: Feature Binary Source: No Signed-off-by: zhangyafei.echo Change-Id: Ieee785af8160519b381b8886ff8c1654caea5c89 --- api/@ohos.application.Ability.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/@ohos.application.Ability.d.ts b/api/@ohos.application.Ability.d.ts index 8a89bbc773..4642593dcd 100755 --- a/api/@ohos.application.Ability.d.ts +++ b/api/@ohos.application.Ability.d.ts @@ -44,7 +44,7 @@ export interface OnReleaseCallBack { * @return rpc.Sequenceable * @StageModelOnly */ -export interface CaleeCallBack { +export interface CalleeCallBack { (indata: rpc.MessageParcel): rpc.Sequenceable; } @@ -123,7 +123,7 @@ export interface Callee { * @return - * @StageModelOnly */ - on(method: string, callback: CaleeCallBack): void; + on(method: string, callback: CalleeCallBack): void; /** * Unregister data listener callback. -- Gitee From ff38dec4208954be5a7c582dfec2ef59185b6480 Mon Sep 17 00:00:00 2001 From: ma-shaoyin Date: Fri, 22 Jul 2022 10:25:18 +0800 Subject: [PATCH 27/30] Signed-off-by: ma-shaoyin Changes to be committed: --- api/@ohos.inputmethod.d.ts | 33 ---------- api/@ohos.inputmethodengine.d.ts | 106 ------------------------------- 2 files changed, 139 deletions(-) diff --git a/api/@ohos.inputmethod.d.ts b/api/@ohos.inputmethod.d.ts index 7a47e7b3c7..0dbd6256dc 100644 --- a/api/@ohos.inputmethod.d.ts +++ b/api/@ohos.inputmethod.d.ts @@ -59,43 +59,10 @@ declare namespace inputMethod { */ function switchInputMethod(target: InputMethodProperty): Promise; - /** - * Get current input method - * @since 9 - * @return The InputMethodProperty object of the current input method - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @StageModelOnly - */ - function getCurrentInputMethod(): InputMethodProperty; - /** * @since 8 */ interface InputMethodSetting { - /** - * List input methods - * @since 9 - * @param enable : - * if true, collect enabled input methods. - * if false, collect disabled input methods. - * @return - - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @StageModelOnly - */ - listInputMethod(enable: boolean, callback: AsyncCallback>): void; - - /** - * List input methods - * @since 9 - * @param enable : - * if true, collect enabled input methods. - * if false, collect disabled input methods. - * @return - - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @StageModelOnly - */ - listInputMethod(enable: boolean): Promise>; - /** * @since 8 */ diff --git a/api/@ohos.inputmethodengine.d.ts b/api/@ohos.inputmethodengine.d.ts index 51f2366f93..82e19e796c 100644 --- a/api/@ohos.inputmethodengine.d.ts +++ b/api/@ohos.inputmethodengine.d.ts @@ -58,13 +58,6 @@ declare namespace inputMethodEngine { const OPTION_MULTI_LINE: number; const OPTION_NO_FULLSCREEN: number; - /** - * The window styles for inputmethod ability. - * @since 9 - * @syscap SystemCapability.MiscServices.InputMethodFramework - */ - const WINDOW_TYPE_INPUT_METHOD_FLOAT: number; - function getInputMethodEngine(): InputMethodEngine; function createKeyboardDelegate(): KeyboardDelegate; @@ -113,28 +106,6 @@ declare namespace inputMethodEngine { getEditorAttribute(callback: AsyncCallback): void; getEditorAttribute(): Promise; - - /** - * Move curosr from input method. - * - * @since 9 - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @param direction Indicates the distance of cursor to be moved. - * @return - - * @StageModelOnly - */ - moveCursor(direction: number, callback: AsyncCallback): void; - - /** - * Move curosr from input method. - * - * @since 9 - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @param direction Indicates the distance of cursor to be moved. - * @return - - * @StageModelOnly - */ - moveCursor(direction: number): Promise; } interface KeyboardDelegate { @@ -164,83 +135,6 @@ declare namespace inputMethodEngine { readonly keyCode: number; readonly keyAction: number; } - - /** - * The extension context class of input method. - * - * @since 9 - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @StageModelOnly - */ - class InputMethodExtensionContext extends ExtensionContext { - - /** - * Input method extension uses this method to start a specific ability. - * - * @since 9 - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @param want Indicates the ability to start. - * @param options Indicates the start options. - * @return - - * @StageModelOnly - */ - startAbility(want: Want, callback: AsyncCallback): void; - startAbility(want: Want, options: StartOptions, callback: AsyncCallback): void; - startAbility(want: Want, options?: StartOptions): Promise; - - /** - * Destroy the input method extension. - * - * @since 9 - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @return - - * @StageModelOnly - */ - terminateSelf(callback: AsyncCallback): void; - terminateSelf(): Promise; - - } - - /** - * The extension ability class of input method. - * - * @since 9 - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @StageModelOnly - */ - class InputMethodExtensionAbility { - - /** - * Indicates input method extension ability context. - * - * @since 9 - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @StageModelOnly - */ - context: InputMethodExtensionContext; - - /** - * Called back when a input method extension is started for initialization. - * - * @since 9 - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @param want Indicates the want of created service extension. - * @return - - * @StageModelOnly - */ - onCreate(want: Want): void; - - /** - * Called back before a input method extension is destroyed. - * - * @since 9 - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @return - - * @StageModelOnly - */ - onDestroy(): void; - - } } export default inputMethodEngine; -- Gitee From 6ff9c1cc20fa556acd9108ccb5b17345ed90c4ed Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 24 Jul 2022 23:25:26 +0800 Subject: [PATCH 28/30] bugfix for wifi api9 0724 Signed-off-by: yanxiaotao --- api/@ohos.wifi.d.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/api/@ohos.wifi.d.ts b/api/@ohos.wifi.d.ts index ceba8186e9..7570a59141 100644 --- a/api/@ohos.wifi.d.ts +++ b/api/@ohos.wifi.d.ts @@ -142,7 +142,9 @@ declare namespace wifi { *

This method adds one configuration at a time. After this configuration is added, * your device will determine whether to connect to the hotspot. * + * @param config - candidate config. * @return Returns {@code networkId} if the configuration is added; returns {@code -1} otherwise. + * * @since 9 * @syscap SystemCapability.Communication.WiFi.STA * @permission ohos.permission.SET_WIFI_INFO @@ -156,13 +158,15 @@ declare namespace wifi { * *

This method removes one configuration at a time. * + * @param networkId - Network ID which will be removed. + * @return Returns {@code true} if the candidate hotspot configuration is removed, returns {@code false} otherwise. + * * @since 9 - * @throws {TypedError | Error} when failed to remove the hotspot configuration. * @syscap SystemCapability.Communication.WiFi.STA * @permission ohos.permission.SET_WIFI_INFO */ - function removeCandidateConfig(networkId: number): Promise; - function removeCandidateConfig(networkId: number, callback: AsyncCallback): void; + function removeCandidateConfig(networkId: number): Promise; + function removeCandidateConfig(networkId: number, callback: AsyncCallback): void; /** * Obtains the list of all existing candidate Wi-Fi configurations which added by ourself. @@ -170,6 +174,7 @@ declare namespace wifi { *

You can obtain only the Wi-Fi configurations you created on your own application. * * @return Returns the list of all existing Wi-Fi configurations you created on your application. + * * @since 9 * @syscap SystemCapability.Communication.WiFi.STA * @permission ohos.permission.GET_WIFI_INFO and ohos.permission.LOCATION @@ -182,13 +187,14 @@ declare namespace wifi { * *

This method connect to a configuration at a time. * - * @param {number} networkId - Network ID which will be connected. - * @throws {TypedError | Error} when failed connect to the hotspot configuration + * @param networkId - Network ID which will be connected. + * Returns {@code true} if the network connection is successful, returns {@code false} otherwise. + * * @since 9 * @syscap SystemCapability.Communication.WiFi.STA * @permission ohos.permission.SET_WIFI_INFO */ - function connectToCandidateConfig(networkId: number): void; + function connectToCandidateConfig(networkId: number): boolean; /** * Connects to Wi-Fi network. -- Gitee From f43030d54ae146ea5ebdb68c729b221aa3c027d1 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 17:14:47 +0800 Subject: [PATCH 29/30] bugfix for api9 0725 Signed-off-by: yanxiaotao@huawei.com --- api/@ohos.wifi.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/@ohos.wifi.d.ts b/api/@ohos.wifi.d.ts index 7570a59141..5e6a405449 100644 --- a/api/@ohos.wifi.d.ts +++ b/api/@ohos.wifi.d.ts @@ -188,7 +188,8 @@ declare namespace wifi { *

This method connect to a configuration at a time. * * @param networkId - Network ID which will be connected. - * Returns {@code true} if the network connection is successful, returns {@code false} otherwise. + * Returns {@code true} if the operation is successful, returns {@code false} otherwise. The result will be + * indicated by the call back function of wifi connection change. * * @since 9 * @syscap SystemCapability.Communication.WiFi.STA -- Gitee From 9988cb7494b265b9abc5cfdf81bfe02723247949 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 17:16:52 +0800 Subject: [PATCH 30/30] bugfix for api9 0725 Signed-off-by: yanxiaotao@huawei.com --- api/@ohos.wifi.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/@ohos.wifi.d.ts b/api/@ohos.wifi.d.ts index 5e6a405449..0ed2e6f197 100644 --- a/api/@ohos.wifi.d.ts +++ b/api/@ohos.wifi.d.ts @@ -188,8 +188,8 @@ declare namespace wifi { *

This method connect to a configuration at a time. * * @param networkId - Network ID which will be connected. - * Returns {@code true} if the operation is successful, returns {@code false} otherwise. The result will be - * indicated by the call back function of wifi connection change. + * Returns {@code true} if the operation is successful, returns {@code false} otherwise. The connect result + * will be indicated by the call back function of wifi connection change. * * @since 9 * @syscap SystemCapability.Communication.WiFi.STA -- Gitee