From 893b3f2ab0f9502337717d774f9e698ed19102b9 Mon Sep 17 00:00:00 2001 From: tangzhigang1 Date: Tue, 31 Jan 2023 17:17:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D3.2.10.6,=20master=E5=90=88?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tangzhigang1 --- .../ets/default/abilitymanager/abilityManager.ts | 16 ++++++++-------- .../pc/src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/ServiceExtAbility/ServiceExtAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/ServiceExtAbility/ServiceExtAbility.ts | 2 +- .../com/ohos/view/component/itemComponent.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/ServiceExtAbility/ServiceExtAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 4 ++-- .../src/main/ets/pages/noDisturb.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/ServiceExtAbility/ServiceExtAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/ServiceExtAbility/ServiceExtAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/ServiceExtAbility/ServiceExtAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/ServiceExtAbility/ServiceExtAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/ServiceExtAbility/ServiceExtAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/ServiceExtAbility/ServiceExtAbility.ts | 2 +- 23 files changed, 31 insertions(+), 31 deletions(-) diff --git a/common/src/main/ets/default/abilitymanager/abilityManager.ts b/common/src/main/ets/default/abilitymanager/abilityManager.ts index fa37cb66..c42956b4 100644 --- a/common/src/main/ets/default/abilitymanager/abilityManager.ts +++ b/common/src/main/ets/default/abilitymanager/abilityManager.ts @@ -1,3 +1,4 @@ + /* * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,8 +15,7 @@ */ import { BusinessError } from 'basic'; -import AbilityContext from 'application/AbilityContext'; -import ServiceExtensionContext from 'application/ServiceExtensionContext'; +import common from '@ohos.app.ability.common' import Want from '@ohos.application.Want'; import Log from '../Log'; @@ -34,12 +34,12 @@ export default class AbilityManager { static readonly ABILITY_NAME_APP_LIST = 'SystemUi_AppList'; static readonly ABILITY_NAME_OWNER_WANT = 'Owner_Want'; - static setContext(abilityName: string, context: ServiceExtensionContext): void { + static setContext(abilityName: string, context): void { Log.showDebug(TAG, `setContext, abilityName: ${abilityName}`); globalThis[abilityName + '_Context'] = context; } - static getContext(abilityName?: string): ServiceExtensionContext { + static getContext(abilityName?: string) { Log.showDebug(TAG, `getContext, abilityName: ${abilityName}`); if (!abilityName) { abilityName = AbilityManager.ABILITY_NAME_ENTRY; @@ -47,12 +47,12 @@ export default class AbilityManager { return globalThis[abilityName + '_Context']; } - static setAbilityContext(abilityName: string, context: AbilityContext): void { + static setAbilityContext(abilityName: string, context: common.UIAbilityContext): void { Log.showDebug(TAG, `setContext, abilityName: ${abilityName}`); globalThis[abilityName + '_Context'] = context; } - static getAbilityContext(abilityName?: string): AbilityContext { + static getAbilityContext(abilityName?: string): common.UIAbilityContext { Log.showDebug(TAG, `getContext, abilityName: ${abilityName}`); if (!abilityName) { abilityName = AbilityManager.ABILITY_NAME_ENTRY; @@ -83,7 +83,7 @@ export default class AbilityManager { return globalThis[abilityName + '_ContextName']; } - static startAbility(context: ServiceExtensionContext, want: Want, callback?: (error?: BusinessError) => void): void { + static startAbility(context: any, want: Want, callback?: (error?: BusinessError) => void): void { Log.showDebug(TAG, `startAbility, want: ${JSON.stringify(want)}`); if (context == null) { context = AbilityManager.getContext(); @@ -101,7 +101,7 @@ export default class AbilityManager { }); } - static startServiceExtensionAbility(context: ServiceExtensionContext, want: Want, callback?: (error?: BusinessError) => void): void { + static startServiceExtensionAbility(context: any, want: Want, callback?: (error?: BusinessError) => void): void { Log.showDebug(TAG, `startServiceExtensionAbility, want: ${JSON.stringify(want)}`); if (context == null) { context = AbilityManager.getContext(); diff --git a/entry/pc/src/main/ets/Application/AbilityStage.ts b/entry/pc/src/main/ets/Application/AbilityStage.ts index 5c2c0ae7..ac81d135 100644 --- a/entry/pc/src/main/ets/Application/AbilityStage.ts +++ b/entry/pc/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from '@ohos.application.AbilityStage'; +import AbilityStage from '@ohos.app.ability.AbilityStage'; import Log from '../../../../../../common/src/main/ets/default/Log'; const TAG = 'SystemUI_AbilityStage'; diff --git a/entry/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/entry/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 60980ca1..d378ff91 100644 --- a/entry/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/entry/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import ServiceExtension from '@ohos.application.ServiceExtensionAbility'; +import ServiceExtension from '@ohos.app.ability.ServiceExtensionAbility'; import Want from '@ohos.application.Want'; import Log from '../../../../../../common/src/main/ets/default/Log'; import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; diff --git a/entry/phone/src/main/ets/Application/AbilityStage.ts b/entry/phone/src/main/ets/Application/AbilityStage.ts index 5c2c0ae7..ac81d135 100644 --- a/entry/phone/src/main/ets/Application/AbilityStage.ts +++ b/entry/phone/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from '@ohos.application.AbilityStage'; +import AbilityStage from '@ohos.app.ability.AbilityStage'; import Log from '../../../../../../common/src/main/ets/default/Log'; const TAG = 'SystemUI_AbilityStage'; diff --git a/entry/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/entry/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 60980ca1..d378ff91 100644 --- a/entry/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/entry/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import ServiceExtension from '@ohos.application.ServiceExtensionAbility'; +import ServiceExtension from '@ohos.app.ability.ServiceExtensionAbility'; import Want from '@ohos.application.Want'; import Log from '../../../../../../common/src/main/ets/default/Log'; import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; diff --git a/features/managementcomponent/src/main/ets/com/ohos/view/component/itemComponent.ets b/features/managementcomponent/src/main/ets/com/ohos/view/component/itemComponent.ets index 185e8e24..708d27c2 100644 --- a/features/managementcomponent/src/main/ets/com/ohos/view/component/itemComponent.ets +++ b/features/managementcomponent/src/main/ets/com/ohos/view/component/itemComponent.ets @@ -17,7 +17,7 @@ import ConfigData from '../../common/constants'; @Component export default struct ItemComponent { @Link title: Resource; - @Link value: ResourceStr; + @Link value: any; @Link arrow: Resource; build() { diff --git a/product/default/navigationBar/src/main/ets/Application/AbilityStage.ts b/product/default/navigationBar/src/main/ets/Application/AbilityStage.ts index 6171bf49..cd9dccab 100644 --- a/product/default/navigationBar/src/main/ets/Application/AbilityStage.ts +++ b/product/default/navigationBar/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from '@ohos.application.AbilityStage'; +import AbilityStage from '@ohos.app.ability.AbilityStage'; import Log from '../../../../../../../common/src/main/ets/default/Log'; const TAG = 'NavigationBar_AbilityStage'; diff --git a/product/default/navigationBar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/default/navigationBar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 34eec4de..97384350 100644 --- a/product/default/navigationBar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/default/navigationBar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -14,7 +14,7 @@ */ import display from '@ohos.display'; -import ServiceExtension from '@ohos.application.ServiceExtensionAbility'; +import ServiceExtension from '@ohos.app.ability.ServiceExtensionAbility'; import Log from '../../../../../../../common/src/main/ets/default/Log'; import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/WindowManager'; import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; diff --git a/product/default/notificationmanagement/src/main/ets/Application/AbilityStage.ts b/product/default/notificationmanagement/src/main/ets/Application/AbilityStage.ts index 21b09845..fe4c10f7 100644 --- a/product/default/notificationmanagement/src/main/ets/Application/AbilityStage.ts +++ b/product/default/notificationmanagement/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from '@ohos.application.AbilityStage'; +import AbilityStage from '@ohos.app.ability.AbilityStage'; import Log from '../../../../../../../common/src/main/ets/default/Log'; const TAG = 'NotificationManagement_AbilityStage'; diff --git a/product/default/notificationmanagement/src/main/ets/MainAbility/MainAbility.ts b/product/default/notificationmanagement/src/main/ets/MainAbility/MainAbility.ts index a8412aa6..c2e708db 100644 --- a/product/default/notificationmanagement/src/main/ets/MainAbility/MainAbility.ts +++ b/product/default/notificationmanagement/src/main/ets/MainAbility/MainAbility.ts @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility' import Want from '@ohos.application.Want'; -import AbilityConstant from "@ohos.application.AbilityConstant"; +import AbilityConstant from "@ohos.app.ability.AbilityConstant"; import Log from '../../../../../../../common/src/main/ets/default/Log'; import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import display from '@ohos.display'; diff --git a/product/default/notificationmanagement/src/main/ets/pages/noDisturb.ets b/product/default/notificationmanagement/src/main/ets/pages/noDisturb.ets index 7025f50e..cb2e6db0 100644 --- a/product/default/notificationmanagement/src/main/ets/pages/noDisturb.ets +++ b/product/default/notificationmanagement/src/main/ets/pages/noDisturb.ets @@ -38,7 +38,7 @@ export default struct NoDisturb { @State startTitle:Resource = $r('app.string.startTime'); @State endTitle:Resource = $r('app.string.endTime'); @State arrow: Resource = $r('app.media.ic_settings_arrow'); - @State repeatName : ResourceStr = this.mViewModel.repeatName + @State repeatName : any = this.mViewModel.repeatName @State startDateClue : string = this.mViewModel.startDateClue @State startTimeClue : string = this.mViewModel.startTimeClue @State endDateClue : string = this.mViewModel.endDateClue diff --git a/product/default/volumepanel/src/main/ets/Application/AbilityStage.ts b/product/default/volumepanel/src/main/ets/Application/AbilityStage.ts index 82e9de89..b9d3a117 100644 --- a/product/default/volumepanel/src/main/ets/Application/AbilityStage.ts +++ b/product/default/volumepanel/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from '@ohos.application.AbilityStage'; +import AbilityStage from '@ohos.app.ability.AbilityStage'; import Log from '../../../../../../../common/src/main/ets/default/Log'; //import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilitymanager' //import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/windowmanager' diff --git a/product/default/volumepanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/default/volumepanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 74446999..bf53a336 100644 --- a/product/default/volumepanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/default/volumepanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import ServiceExtension from '@ohos.application.ServiceExtensionAbility'; +import ServiceExtension from '@ohos.app.ability.ServiceExtensionAbility'; import Want from '@ohos.application.Want'; import display from '@ohos.display'; import Log from '../../../../../../../common/src/main/ets/default/Log'; diff --git a/product/pc/controlpanel/src/main/ets/Application/AbilityStage.ts b/product/pc/controlpanel/src/main/ets/Application/AbilityStage.ts index c1896825..fac1e5c9 100644 --- a/product/pc/controlpanel/src/main/ets/Application/AbilityStage.ts +++ b/product/pc/controlpanel/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from '@ohos.application.AbilityStage'; +import AbilityStage from '@ohos.app.ability.AbilityStage'; import Log from '../../../../../../../common/src/main/ets/default/Log'; const TAG = 'ControlPanel_AbilityStage'; diff --git a/product/pc/controlpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/pc/controlpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 918257a4..b6262497 100644 --- a/product/pc/controlpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/pc/controlpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import ServiceExtension from '@ohos.application.ServiceExtensionAbility'; +import ServiceExtension from '@ohos.app.ability.ServiceExtensionAbility'; import display from '@ohos.display'; import Log from '../../../../../../../common/src/main/ets/default/Log'; import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/WindowManager'; diff --git a/product/pc/notificationpanel/src/main/ets/Application/AbilityStage.ts b/product/pc/notificationpanel/src/main/ets/Application/AbilityStage.ts index 85c3869b..2495ec64 100644 --- a/product/pc/notificationpanel/src/main/ets/Application/AbilityStage.ts +++ b/product/pc/notificationpanel/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from '@ohos.application.AbilityStage'; +import AbilityStage from '@ohos.app.ability.AbilityStage'; import Log from '../../../../../../../common/src/main/ets/default/Log'; const TAG = 'NotificationPanel_AbilityStage'; diff --git a/product/pc/notificationpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/pc/notificationpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 7695abba..21e38a29 100644 --- a/product/pc/notificationpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/pc/notificationpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import ServiceExtension from '@ohos.application.ServiceExtensionAbility'; +import ServiceExtension from '@ohos.app.ability.ServiceExtensionAbility'; import Want from '@ohos.application.Want'; import display from '@ohos.display'; import Log from '../../../../../../../common/src/main/ets/default/Log'; diff --git a/product/pc/statusbar/src/main/ets/Application/AbilityStage.ts b/product/pc/statusbar/src/main/ets/Application/AbilityStage.ts index ff108a0c..2cb8af62 100644 --- a/product/pc/statusbar/src/main/ets/Application/AbilityStage.ts +++ b/product/pc/statusbar/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from '@ohos.application.AbilityStage'; +import AbilityStage from '@ohos.app.ability.AbilityStage'; import Log from '../../../../../../../common/src/main/ets/default/Log'; const TAG = 'StatusBar_AbilityStage'; diff --git a/product/pc/statusbar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/pc/statusbar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 96ec00f9..279044f4 100644 --- a/product/pc/statusbar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/pc/statusbar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import ServiceExtension from '@ohos.application.ServiceExtensionAbility'; +import ServiceExtension from '@ohos.app.ability.ServiceExtensionAbility'; import Log from '../../../../../../../common/src/main/ets/default/Log'; import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/WindowManager'; import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; diff --git a/product/phone/dropdownpanel/src/main/ets/Application/AbilityStage.ts b/product/phone/dropdownpanel/src/main/ets/Application/AbilityStage.ts index 8820fd7f..f373142a 100644 --- a/product/phone/dropdownpanel/src/main/ets/Application/AbilityStage.ts +++ b/product/phone/dropdownpanel/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from '@ohos.application.AbilityStage'; +import AbilityStage from '@ohos.app.ability.AbilityStage'; import Log from '../../../../../../../common/src/main/ets/default/Log'; const TAG = 'DropdownPanel_AbilityStage'; diff --git a/product/phone/dropdownpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/phone/dropdownpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 2af27391..62022902 100644 --- a/product/phone/dropdownpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/phone/dropdownpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import ServiceExtension from '@ohos.application.ServiceExtensionAbility'; +import ServiceExtension from '@ohos.app.ability.ServiceExtensionAbility'; import display from '@ohos.display'; import Log from '../../../../../../../common/src/main/ets/default/Log'; import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/WindowManager'; diff --git a/product/phone/statusbar/src/main/ets/Application/AbilityStage.ts b/product/phone/statusbar/src/main/ets/Application/AbilityStage.ts index ff108a0c..2cb8af62 100644 --- a/product/phone/statusbar/src/main/ets/Application/AbilityStage.ts +++ b/product/phone/statusbar/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from '@ohos.application.AbilityStage'; +import AbilityStage from '@ohos.app.ability.AbilityStage'; import Log from '../../../../../../../common/src/main/ets/default/Log'; const TAG = 'StatusBar_AbilityStage'; diff --git a/product/phone/statusbar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/phone/statusbar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 7f6a7fcb..72b743e7 100644 --- a/product/phone/statusbar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/phone/statusbar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -14,7 +14,7 @@ */ import display from '@ohos.display'; -import ServiceExtension from '@ohos.application.ServiceExtensionAbility'; +import ServiceExtension from '@ohos.app.ability.ServiceExtensionAbility'; import Log from '../../../../../../../common/src/main/ets/default/Log'; import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/WindowManager'; import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager';