openharmony/applications_systemui
1
0
Fork 0
mirror of https://github.com/openharmony/applications_systemui.git synced 2026-07-18 17:34:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

!291 适配3.2.10.6，代码beta5

Browse Source 
Merge pull request !291 from SEASON_SYSU/master
This commit is contained in:
openharmony_ci
2023-01-31 14:04:18 +00:00
committed by Gitee
parent c9a20de138 893b3f2ab0
commit 03e680b06f
23 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/ets/default/abilitymanager/abilityManager.ts
+8 -8
View File
@@ -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();
entry/pc/src/main/ets/Application/AbilityStage.ts
+1 -1
View File
@@ -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';
entry/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts
+1 -1
View File
@@ -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';
entry/phone/src/main/ets/Application/AbilityStage.ts
+1 -1
View File
@@ -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';
entry/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts
+1 -1
View File
@@ -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';
features/managementcomponent/src/main/ets/com/ohos/view/component/itemComponent.ets
+1 -1
View File
@@ -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() {
product/default/navigationBar/src/main/ets/Application/AbilityStage.ts
+1 -1
View File
@@ -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';
product/default/navigationBar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts
+1 -1
View File
@@ -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';
product/default/notificationmanagement/src/main/ets/Application/AbilityStage.ts
+1 -1
View File
@@ -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';
product/default/notificationmanagement/src/main/ets/MainAbility/MainAbility.ts
+2 -2
View File
@@ -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';
product/default/notificationmanagement/src/main/ets/pages/noDisturb.ets
+1 -1
View File
@@ -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
product/default/volumepanel/src/main/ets/Application/AbilityStage.ts
+1 -1
View File
@@ -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'
product/default/volumepanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts
+1 -1
View File
@@ -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';
product/pc/controlpanel/src/main/ets/Application/AbilityStage.ts
+1 -1
View File
@@ -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';
product/pc/controlpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts
+1 -1
View File
@@ -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';
product/pc/notificationpanel/src/main/ets/Application/AbilityStage.ts
+1 -1
View File
@@ -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';
product/pc/notificationpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts
+1 -1
View File
@@ -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';
product/pc/statusbar/src/main/ets/Application/AbilityStage.ts
+1 -1
View File
@@ -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';
product/pc/statusbar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts
+1 -1
View File
@@ -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';
product/phone/dropdownpanel/src/main/ets/Application/AbilityStage.ts
+1 -1
View File
@@ -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';
product/phone/dropdownpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts
+1 -1
View File
@@ -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';
product/phone/statusbar/src/main/ets/Application/AbilityStage.ts
+1 -1
View File
@@ -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';
product/phone/statusbar/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts
+1 -1
View File
@@ -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';