From 838e8da2ab4bb600f287abbde37bdfdecc471030 Mon Sep 17 00:00:00 2001 From: lijinfengde123 Date: Tue, 19 Jul 2022 21:08:51 +0800 Subject: [PATCH] =?UTF-8?q?systemui=E5=90=84=E4=B8=AA=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B9=8B=E9=97=B4context=E8=A7=A3=E8=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lijinfengde123 --- common/src/main/ets/default/ResourceUtil.ts | 12 ++++++--- common/src/main/ets/default/SettingsUtil.ts | 2 +- .../default/abilitymanager/abilityManager.ts | 27 +++++++++++++++++++ .../common/PluginComponentManagerUtil.ts | 1 + .../src/main/ets/default/brightnessManager.ts | 3 ++- .../ets/default/viewmodel/CapsuleViewModel.ts | 1 + .../com/ohos/model/ControlCenterService.ts | 5 ++-- .../ets/com/ohos/model/bundleResourceModel.ts | 2 +- .../ohos/vm/noDisturbComponentViewModel.ts | 2 ++ .../ohos/noticeItem/model/ParseDataUtil.ts | 3 ++- .../com/ohos/common/StatusBarConfiguration.ts | 2 ++ .../ets/com/ohos/model/StatusBarService.ts | 2 +- .../main/ets/common/NavBarConfiguration.ts | 2 ++ .../ets/viewmodel/NavigationBarViewModel.ts | 6 ++--- .../src/main/ets/MainAbility/MainAbility.ts | 1 + .../src/main/ets/pages/control.ets | 3 +++ .../ServiceExtAbility/ServiceExtAbility.ts | 1 - .../src/main/ets/pages/bannerNotification.ets | 3 ++- .../src/main/ets/pages/notification.ets | 4 ++- .../ServiceExtAbility/ServiceExtAbility.ts | 1 - .../src/main/ets/pages/bannerNotification.ets | 3 ++- .../src/main/ets/pages/control.ets | 3 +++ .../src/main/ets/pages/index.ets | 4 ++- .../src/main/ets/pages/notification.ets | 5 +++- 24 files changed, 77 insertions(+), 21 deletions(-) diff --git a/common/src/main/ets/default/ResourceUtil.ts b/common/src/main/ets/default/ResourceUtil.ts index b01b922a..9f57e18c 100644 --- a/common/src/main/ets/default/ResourceUtil.ts +++ b/common/src/main/ets/default/ResourceUtil.ts @@ -23,9 +23,15 @@ export class ResourceUtil { /** * Initialize ResourceManager */ - async initResourceManager(): Promise { + async initResourceManager(abilityName?: string): Promise { if (!this.resMgr) { - let context = AbilityManager.getContext(); + + let context; + if(abilityName === AbilityManager.ABILITY_NAME_NOTIFICATION_MANAGEMENT) { + context = AbilityManager.getAbilityContext(abilityName); + } else { + context = AbilityManager.getContext(abilityName); + } this.resMgr = await context.resourceManager; } return this.resMgr; @@ -37,7 +43,6 @@ export class ResourceUtil { * @param resource - NormalResource instance */ async getString(resource): Promise { - await this.initResourceManager(); return await this.resMgr.getString(resource.id); } @@ -47,7 +52,6 @@ export class ResourceUtil { * @param resource - NormalResource instance */ async getConfiguration(): Promise { - await this.initResourceManager(); return await this.resMgr.getConfiguration(); } } diff --git a/common/src/main/ets/default/SettingsUtil.ts b/common/src/main/ets/default/SettingsUtil.ts index a09c67db..b5100ea7 100644 --- a/common/src/main/ets/default/SettingsUtil.ts +++ b/common/src/main/ets/default/SettingsUtil.ts @@ -30,7 +30,7 @@ export class SettingsUtil { constructor() { Log.showDebug(TAG, 'constructor'); try { - this.helper = featureAbility.acquireDataAbilityHelper(AbilityManager.getContext(), Constants.URI_VAR); + this.helper = featureAbility.acquireDataAbilityHelper(AbilityManager.getContext(this.context), Constants.URI_VAR); } catch (e) { Log.showError(TAG, `constructor, acquire helper error: ${JSON.stringify(e)}`); } diff --git a/common/src/main/ets/default/abilitymanager/abilityManager.ts b/common/src/main/ets/default/abilitymanager/abilityManager.ts index 64b31c0e..36bb9909 100644 --- a/common/src/main/ets/default/abilitymanager/abilityManager.ts +++ b/common/src/main/ets/default/abilitymanager/abilityManager.ts @@ -14,6 +14,7 @@ */ import { BusinessError } from 'basic'; +import AbilityContext from 'application/AbilityContext'; import ServiceExtensionContext from 'application/ServiceExtensionContext'; import Want from '@ohos.application.Want'; import Log from '../Log'; @@ -46,6 +47,19 @@ export default class AbilityManager { return globalThis[abilityName + '_Context']; } + static setAbilityContext(abilityName: string, context: AbilityContext): void { + Log.showDebug(TAG, `setContext, abilityName: ${abilityName}`); + globalThis[abilityName + '_Context'] = context; + } + + static getAbilityContext(abilityName?: string): AbilityContext { + Log.showDebug(TAG, `getContext, abilityName: ${abilityName}`); + if (!abilityName) { + abilityName = AbilityManager.ABILITY_NAME_ENTRY; + } + return globalThis[abilityName + '_Context']; + } + static setAbilityData(abilityName: string, key: string, data: any): void { Log.showDebug(TAG, `setAbilityData, abilityName: ${abilityName} key: ${key} data: ${JSON.stringify(data)}`); globalThis[abilityName + '_data_' + key] = data; @@ -56,6 +70,19 @@ export default class AbilityManager { return globalThis[abilityName + '_data_' + key]; } + static setContextName(abilityName: string, contextName: string): void { + Log.showDebug(TAG, `setContextName, abilityName: ${abilityName}`); + globalThis[abilityName + '_ContextName'] = contextName; + } + + static getContextName(abilityName?: string): string { + Log.showDebug(TAG, `setContextName, abilityName: ${abilityName}`); + if (!abilityName) { + abilityName = AbilityManager.ABILITY_NAME_ENTRY; + } + return globalThis[abilityName + '_ContextName']; + } + static startAbility(want: Want, callback?: (error?: BusinessError) => void): void { Log.showDebug(TAG, `startAbility, want: ${JSON.stringify(want)}`); let context: ServiceExtensionContext = AbilityManager.getContext(); diff --git a/common/src/main/ets/plugindatasource/common/PluginComponentManagerUtil.ts b/common/src/main/ets/plugindatasource/common/PluginComponentManagerUtil.ts index 6c3c448b..63bd5d30 100644 --- a/common/src/main/ets/plugindatasource/common/PluginComponentManagerUtil.ts +++ b/common/src/main/ets/plugindatasource/common/PluginComponentManagerUtil.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/features/brightnesscomponent/src/main/ets/default/brightnessManager.ts b/features/brightnesscomponent/src/main/ets/default/brightnessManager.ts index 52710acd..8c2489c2 100644 --- a/features/brightnesscomponent/src/main/ets/default/brightnessManager.ts +++ b/features/brightnesscomponent/src/main/ets/default/brightnessManager.ts @@ -36,7 +36,8 @@ export class brightnessManager { Log.showInfo(TAG, 'init'); this.uri = settings.getUriSync(SYSTEMUI_BRIGHTNESS); Log.showInfo(TAG, 'settings geturi of brightness is ' + this.uri); - this.helper = featureAbility.acquireDataAbilityHelper(AbilityManager.getContext(), CommonConstants.URI_VAR); + let contextName = AbilityManager.getContextName(AbilityManager.ABILITY_NAME_CONTROL_PANEL); + this.helper = featureAbility.acquireDataAbilityHelper(AbilityManager.getContext(contextName), CommonConstants.URI_VAR); this.getValue(); } diff --git a/features/capsulecomponent/src/main/ets/default/viewmodel/CapsuleViewModel.ts b/features/capsulecomponent/src/main/ets/default/viewmodel/CapsuleViewModel.ts index 954e9819..5d5a00bd 100644 --- a/features/capsulecomponent/src/main/ets/default/viewmodel/CapsuleViewModel.ts +++ b/features/capsulecomponent/src/main/ets/default/viewmodel/CapsuleViewModel.ts @@ -68,6 +68,7 @@ export default class CapsuleViewModel { this.mIsBackground = data.isBackground; this.mWantBundleName = data.wantBundleName; this.mWantAbilityName = data.wantAbilityName; + await ResourceUtil.initResourceManager(AbilityManager.ABILITY_NAME_STATUS_BAR); if (data.callState == CallState.CALL_INCOMING || data.callState == CallState.CALL_WAITING) { this.mStartTime = 0; this.mText =await ResourceUtil.getString($r("app.string.incoming_call")); diff --git a/features/controlcentercomponent/src/main/ets/com/ohos/model/ControlCenterService.ts b/features/controlcentercomponent/src/main/ets/com/ohos/model/ControlCenterService.ts index 0b9cb5c8..db502da9 100644 --- a/features/controlcentercomponent/src/main/ets/com/ohos/model/ControlCenterService.ts +++ b/features/controlcentercomponent/src/main/ets/com/ohos/model/ControlCenterService.ts @@ -85,8 +85,9 @@ export class ControlCenterService { SwitchUserManager.getInstance().registerListener(this); CONTROLCENTER_SOURCE_CONFIG.filterDatas = config.MetaToggles; - this.mAdapter = new PluginDataSourceAdapter(TAG, AbilityManager.getContext(), this, moduleName); - this.mAdapter.setWant(globalThis[Constants.PLUGIN_COMPONENT_OWNER_WANT_KEY]);//xuchanghzou + let contextName = AbilityManager.getContextName(AbilityManager.ABILITY_NAME_CONTROL_PANEL); + this.mAdapter = new PluginDataSourceAdapter(TAG, AbilityManager.getContext(contextName), this, moduleName); + this.mAdapter.setWant(globalThis[Constants.PLUGIN_COMPONENT_OWNER_WANT_KEY]); this.mAdapter.initDataSource(CONTROLCENTER_SOURCE_CONFIG); } diff --git a/features/managementcomponent/src/main/ets/com/ohos/model/bundleResourceModel.ts b/features/managementcomponent/src/main/ets/com/ohos/model/bundleResourceModel.ts index ff5e9c7e..d6deffc2 100644 --- a/features/managementcomponent/src/main/ets/com/ohos/model/bundleResourceModel.ts +++ b/features/managementcomponent/src/main/ets/com/ohos/model/bundleResourceModel.ts @@ -54,7 +54,7 @@ export default class BundleResourceModel { let label = ''; let that = this; try { - let bundleContext = await AbilityManager.getContext().createBundleContext(data[index].name); + let bundleContext = await AbilityManager.getAbilityContext(AbilityManager.ABILITY_NAME_NOTIFICATION_MANAGEMENT).createBundleContext(data[index].name); let bundleResourceManager = await bundleContext.resourceManager; let appInfo = data[index].appInfo; if (parseInt(appInfo.labelId) > 0) { diff --git a/features/managementcomponent/src/main/ets/com/ohos/vm/noDisturbComponentViewModel.ts b/features/managementcomponent/src/main/ets/com/ohos/vm/noDisturbComponentViewModel.ts index 6152d1e4..089c1419 100644 --- a/features/managementcomponent/src/main/ets/com/ohos/vm/noDisturbComponentViewModel.ts +++ b/features/managementcomponent/src/main/ets/com/ohos/vm/noDisturbComponentViewModel.ts @@ -13,6 +13,7 @@ * limitations under the License. */ +import AbilityManager from '../../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import Log from '../../../../../../../../common/src/main/ets/default/Log'; import ResourceUtil from '../../../../../../../../common/src/main/ets/default/ResourceUtil'; import NoDisturbingModel from '../model/noDisturbingModel'; @@ -180,6 +181,7 @@ export default class NoDisturbComponentViewModel { return result; } async getNextDayLabel(): Promise { + await ResourceUtil.initResourceManager(AbilityManager.ABILITY_NAME_NOTIFICATION_MANAGEMENT); this.nextDayLabel = await ResourceUtil.getString($r('app.string.noDisturb_nextDay')); } } diff --git a/features/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts b/features/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts index 4067a80e..b3c62052 100644 --- a/features/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts +++ b/features/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts @@ -105,7 +105,8 @@ export default class ParseDataUtil { let data = await BundleManager.getBundleInfo(TAG, bundleName, 0, userId); let labelId = data?.appInfo?.labelId; let iconId = data?.appInfo?.iconId; - let item = await BundleManager.getResourceManager(TAG, AbilityManager.getContext(), bundleName); + let contextName = AbilityManager.getContextName(AbilityManager.ABILITY_NAME_NOTIFICATION_PANEL); + let item = await BundleManager.getResourceManager(TAG, AbilityManager.getContext(contextName), bundleName); let appMessage = { appName: await item.getString(parseInt(labelId)), icon: await item.getMediaBase64(parseInt(iconId)) diff --git a/features/statusbarcomponent/src/main/ets/com/ohos/common/StatusBarConfiguration.ts b/features/statusbarcomponent/src/main/ets/com/ohos/common/StatusBarConfiguration.ts index 0f5dd46c..26ea39ea 100644 --- a/features/statusbarcomponent/src/main/ets/com/ohos/common/StatusBarConfiguration.ts +++ b/features/statusbarcomponent/src/main/ets/com/ohos/common/StatusBarConfiguration.ts @@ -13,6 +13,7 @@ * limitations under the License. */ +import AbilityManager from '../../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import display from '@ohos.display' import Log from '../../../../../../../../common/src/main/ets/default/Log' import ResourceUtil from '../../../../../../../../common/src/main/ets/default/ResourceUtil' @@ -62,6 +63,7 @@ class StatusBarConfiguration { async getDirectionAndPosition() { Log.showInfo(TAG, 'getDirectionAndPosition'); + await ResourceUtil.initResourceManager(AbilityManager.ABILITY_NAME_STATUS_BAR); directionStatus = await ResourceUtil.getConfiguration(); let style: any = CommonStyleConfiguration.getCommonStyle() let deviceTypeInfo = style.deviceTypeInfo diff --git a/features/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts b/features/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts index 0eae3d1d..41c404bf 100644 --- a/features/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts +++ b/features/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts @@ -95,7 +95,7 @@ export class StatusBarService { SwitchUserManager.getInstance().registerListener(this); STATUSBAR_SOURCE_CONFIG.filterDatas = config.MetaSlots; - this.mAdapter = new PluginDataSourceAdapter(TAG, AbilityManager.getContext(), this, moduleName); + this.mAdapter = new PluginDataSourceAdapter(TAG, AbilityManager.getContext(AbilityManager.ABILITY_NAME_STATUS_BAR), this, moduleName); this.mAdapter.setWant(globalThis[Constants.PLUGIN_COMPONENT_OWNER_WANT_KEY]); this.mAdapter.initDataSource(STATUSBAR_SOURCE_CONFIG); } diff --git a/product/default/navigationBar/src/main/ets/common/NavBarConfiguration.ts b/product/default/navigationBar/src/main/ets/common/NavBarConfiguration.ts index 749be300..d3474323 100644 --- a/product/default/navigationBar/src/main/ets/common/NavBarConfiguration.ts +++ b/product/default/navigationBar/src/main/ets/common/NavBarConfiguration.ts @@ -13,6 +13,7 @@ * limitations under the License. */ +import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import display from '@ohos.display'; import Log from '../../../../../../../common/src/main/ets/default/log'; import ResourceUtil from '../../../../../../../common/src/main/ets/default/resourceutil'; @@ -61,6 +62,7 @@ class NavBarConfiguration { } async getDirectionAndPosition() { + await ResourceUtil.initResourceManager(AbilityManager.ABILITY_NAME_NAVIGATION_BAR); directionNav = await ResourceUtil.getConfiguration(); if (directionNav.direction == -1) { statusbarPosition = await ResourceUtil.getString($r("app.string.status_bar_position_landscape")) diff --git a/product/default/navigationBar/src/main/ets/viewmodel/NavigationBarViewModel.ts b/product/default/navigationBar/src/main/ets/viewmodel/NavigationBarViewModel.ts index d4f67582..b3c1b537 100644 --- a/product/default/navigationBar/src/main/ets/viewmodel/NavigationBarViewModel.ts +++ b/product/default/navigationBar/src/main/ets/viewmodel/NavigationBarViewModel.ts @@ -52,12 +52,12 @@ export default class NavigationBarViewModel { this.mNavigationBarComponentData = AppStorage.SetAndLink(NAVIGATION_BAR_COMPONENT_DATA_KEY, this.mNavigationBarComponentData).get() this.urivar = settings.getUriSync(this.settingDataKey); - if (AbilityManager.getContext() == null) { + if (AbilityManager.getContext(AbilityManager.ABILITY_NAME_NAVIGATION_BAR) == null) { Log.showError(TAG, 'AbilityManager.getContext() is null'); } else { - Log.showInfo(TAG, 'context: ' + AbilityManager.getContext()); + Log.showInfo(TAG, 'context: ' + AbilityManager.getContext(AbilityManager.ABILITY_NAME_NAVIGATION_BAR)); } - this.helper = featureAbility.acquireDataAbilityHelper(AbilityManager.getContext(), CommonConstants.URI_VAR); + this.helper = featureAbility.acquireDataAbilityHelper(AbilityManager.getContext(AbilityManager.ABILITY_NAME_NAVIGATION_BAR), CommonConstants.URI_VAR); this.initNavigationBarStatus(); } diff --git a/product/default/notificationmanagement/src/main/ets/MainAbility/MainAbility.ts b/product/default/notificationmanagement/src/main/ets/MainAbility/MainAbility.ts index ba7fb6d9..a8412aa6 100644 --- a/product/default/notificationmanagement/src/main/ets/MainAbility/MainAbility.ts +++ b/product/default/notificationmanagement/src/main/ets/MainAbility/MainAbility.ts @@ -24,6 +24,7 @@ const TAG = 'NotificationManagement-MainAbility'; export default class MainAbility extends Ability { onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { Log.showInfo(TAG, 'MainAbility onCreate'); + AbilityManager.setAbilityContext(AbilityManager.ABILITY_NAME_NOTIFICATION_MANAGEMENT, this.context); globalThis[AbilityManager.ABILITY_NAME_NOTIFICATION_MANAGEMENT + '_want'] = want; } diff --git a/product/pc/controlpanel/src/main/ets/pages/control.ets b/product/pc/controlpanel/src/main/ets/pages/control.ets index a07a4b2f..14354243 100644 --- a/product/pc/controlpanel/src/main/ets/pages/control.ets +++ b/product/pc/controlpanel/src/main/ets/pages/control.ets @@ -12,6 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import ControlCenterComponent from '../../../../../../../features/controlcentercomponent/src/main/ets/com/ohos/pages/ControlCenterComponent' import Log from '../../../../../../../common/src/main/ets/default/Log' import Constants from './common/constants' @@ -25,6 +27,7 @@ export default struct Control { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear Start`) + AbilityManager.setContextName(AbilityManager.ABILITY_NAME_CONTROL_PANEL,AbilityManager.ABILITY_NAME_CONTROL_PANEL); } aboutToDisappear() { diff --git a/product/pc/notificationpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/pc/notificationpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index dd91590d..46d41405 100644 --- a/product/pc/notificationpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/pc/notificationpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -48,7 +48,6 @@ class ServiceExtAbility extends ServiceExtension { Log.showError(TAG, `Can't create window, err:${JSON.stringify(err)}`); }); - AbilityManager.setContext(AbilityManager.ABILITY_NAME_BANNER_NOTICE, this.context); let bannerRect = { left: 872 * dis.width / 1280, top: 44 * dis.width / 1280, diff --git a/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets b/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets index 72199098..ddae1413 100644 --- a/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets +++ b/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets @@ -38,7 +38,8 @@ struct Index { mDefaultBannerRect: any; aboutToAppear() { - Log.showInfo(TAG, `aboutToAppear Start`) + Log.showInfo(TAG, `aboutToAppear Start`); + AbilityManager.setContextName(AbilityManager.ABILITY_NAME_NOTIFICATION_PANEL,AbilityManager.ABILITY_NAME_NOTIFICATION_PANEL); setAppBgColor('#00000000') this.mClearCallbacks = [] this.mClearCallbacks.push(EventManager.subscribe('onBannerNoticeShow', () => this.onBannerNoticeShow())) diff --git a/product/pc/notificationpanel/src/main/ets/pages/notification.ets b/product/pc/notificationpanel/src/main/ets/pages/notification.ets index 924dc3f7..0da4fd1d 100644 --- a/product/pc/notificationpanel/src/main/ets/pages/notification.ets +++ b/product/pc/notificationpanel/src/main/ets/pages/notification.ets @@ -13,6 +13,7 @@ * limitations under the License. */ +import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import Log from '../../../../../../../common/src/main/ets/default/Log' import EventManager from "../../../../../../../common/src/main/ets/default/event/eventmanager" import {obtainStartAbility} from "../../../../../../../common/src/main/ets/default/event/eventutil" @@ -34,7 +35,8 @@ export default struct Notification { @StorageLink('notificationList') notificationList: any[] = [] aboutToAppear() { - Log.showInfo(TAG, `aboutToAppear Start`) + Log.showInfo(TAG, `aboutToAppear Start`); + AbilityManager.setContextName(AbilityManager.ABILITY_NAME_NOTIFICATION_PANEL,AbilityManager.ABILITY_NAME_NOTIFICATION_PANEL); } build() { diff --git a/product/phone/dropdownpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/phone/dropdownpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 2d8e3476..004380b8 100644 --- a/product/phone/dropdownpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/phone/dropdownpanel/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -43,7 +43,6 @@ class ServiceExtAbility extends ServiceExtension { }).catch((err) => { }); - AbilityManager.setContext(AbilityManager.ABILITY_NAME_BANNER_NOTICE, this.context); let bannerRect = { left: 0, top: dis.height / 5, diff --git a/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets b/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets index fb656302..aa7c7c58 100644 --- a/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets +++ b/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets @@ -38,7 +38,8 @@ struct Index { mDefaultBannerRect: any; aboutToAppear() { - Log.showInfo(TAG, `aboutToAppear Start`) + Log.showInfo(TAG, `aboutToAppear Start`); + AbilityManager.setContextName(AbilityManager.ABILITY_NAME_NOTIFICATION_PANEL,AbilityManager.ABILITY_NAME_DROPDOWN_PANEL); setAppBgColor('#00000000') this.mClearCallbacks = [] this.mClearCallbacks.push(EventManager.subscribe('onBannerNoticeShow', () => this.onBannerNoticeShow())) diff --git a/product/phone/dropdownpanel/src/main/ets/pages/control.ets b/product/phone/dropdownpanel/src/main/ets/pages/control.ets index 1d5a9603..f475b887 100644 --- a/product/phone/dropdownpanel/src/main/ets/pages/control.ets +++ b/product/phone/dropdownpanel/src/main/ets/pages/control.ets @@ -12,6 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import ControlCenterComponent from '../../../../../../../features/controlcentercomponent/src/main/ets/com/ohos/pages/ControlCenterComponent' import BatteryIcon from '../../../../../../../features/batterycomponent/src/main/ets/default/pages/batteryIcon' import ClockIcon from '../../../../../../../features/clockcomponent/src/main/ets/default/pages/clockIcon' @@ -38,6 +40,7 @@ export default struct Control { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear Start`) + AbilityManager.setContextName(AbilityManager.ABILITY_NAME_CONTROL_PANEL,AbilityManager.ABILITY_NAME_DROPDOWN_PANEL); } aboutToDisappear() { diff --git a/product/phone/dropdownpanel/src/main/ets/pages/index.ets b/product/phone/dropdownpanel/src/main/ets/pages/index.ets index d5f88b52..06a84ca4 100644 --- a/product/phone/dropdownpanel/src/main/ets/pages/index.ets +++ b/product/phone/dropdownpanel/src/main/ets/pages/index.ets @@ -22,6 +22,7 @@ import SignalIcon from '../../../../../../../features/signalcomponent/src/main/e import LocationIcon from '../../../../../../../features/locationcomponent/src/main/ets/com/ohos/pages/StatusBarIconItemLocationComponent' import RingModeIcon from '../../../../../../../features/ringmodecomponent/src/main/ets/com/ohos/pages/StatusBarIconItemRingModeComponent' +import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import image from "@ohos.multimedia.image" import Log from '../../../../../../../common/src/main/ets/default/Log' import Trace from '../../../../../../../common/src/main/ets/default/Trace' @@ -42,6 +43,7 @@ import featureAbility from '@ohos.ability.featureAbility'; import settings from '@ohos.settings'; import CommonConstants from "../../../../../../../common/src/main/ets/default/Constants"; + const TAG = 'DropdownPanel-Index' let mHeightConfigUtils @@ -99,7 +101,7 @@ struct Index { let dropdownRect = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_DROPDOWN_PANEL, 'rect') let navigationBarRect = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_NAVIGATION_BAR, 'config') this.urivar = settings.getUriSync(this.settingDataKey); - this.helper = featureAbility.acquireDataAbilityHelper(AbilityManager.getContext(), CommonConstants.URI_VAR); + this.helper = featureAbility.acquireDataAbilityHelper(AbilityManager.getContext(AbilityManager.ABILITY_NAME_DROPDOWN_PANEL), CommonConstants.URI_VAR); this.resizeDropdownPanelAndNavigationBar(dropdownRect, navigationBarRect); Log.showDebug(TAG, `getValueSync componentOptAreaHeightPX: ${this.componentOptAreaHeightPX}`) this.helper.on("dataChange", this.urivar, (data) => { diff --git a/product/phone/dropdownpanel/src/main/ets/pages/notification.ets b/product/phone/dropdownpanel/src/main/ets/pages/notification.ets index f81423e5..511c3515 100644 --- a/product/phone/dropdownpanel/src/main/ets/pages/notification.ets +++ b/product/phone/dropdownpanel/src/main/ets/pages/notification.ets @@ -13,6 +13,7 @@ * limitations under the License. */ +import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import Log from '../../../../../../../common/src/main/ets/default/Log' import EventManager, { unsubscribe } from "../../../../../../../common/src/main/ets/default/event/eventmanager" import { obtainStartAbility } from "../../../../../../../common/src/main/ets/default/event/eventutil" @@ -49,7 +50,8 @@ export default struct Notification { @StorageLink('notificationList') notificationList: any[] = [] aboutToAppear() { - Log.showInfo(TAG, `aboutToAppear Start`) + Log.showInfo(TAG, `aboutToAppear Start`); + AbilityManager.setContextName(AbilityManager.ABILITY_NAME_NOTIFICATION_PANEL,AbilityManager.ABILITY_NAME_DROPDOWN_PANEL); } build() { @@ -249,6 +251,7 @@ struct CenterTitle { async updateTimeString(date: Date) { this.mTime = TimeManager.formatTime(date); Log.showDebug(TAG, ` month is ${date.getMonth() + 1} , day is ${date.getDate()} , week is ${Constants.WEEKDAY_LIST[date.getDay() - 1]}`); + await ResourceUtil.initResourceManager(AbilityManager.ABILITY_NAME_DROPDOWN_PANEL); let timeString = (date.getMonth() + 1) + (await ResourceUtil.getString($r('app.string.month'))); timeString += date.getDate() + (await ResourceUtil.getString($r('app.string.day'))); timeString += await ResourceUtil.getString(Constants.WEEKDAY_LIST[date.getDay()]);