From 02a8797af32f2480e35ad2b73c9da0cd73c5aefa Mon Sep 17 00:00:00 2001 From: lianyi Date: Tue, 25 Apr 2023 17:41:33 +0800 Subject: [PATCH] =?UTF-8?q?common=E5=B1=82=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/index.ets | 4 +- .../src/main/ets/default/CheckEmptyUtils.ts | 47 ---------- common/src/main/ets/default/InitSystemUi.ts | 31 ------- .../main/ets/default/StyleConfiguration.ts | 35 -------- common/src/main/ets/default/Trace.ts | 85 ------------------- .../default/abilitymanager/bundleManager.ts | 2 +- .../main/ets/default/base/BaseDragHandler.ts | 2 +- .../default/{interface => base}/DragArea.ts | 0 .../{interface => base}/DragItemPosition.ts | 0 .../base}/SimpleToggleBase.ets | 4 +- .../base}/iconTitleBase.ets | 6 +- .../default/commonEvent/CommonEventManager.ts | 4 +- .../ets/default/{ => constants}/Constants.ts | 0 .../constants/PluginConstants.ts} | 4 +- .../HeightConfigUtils.ts | 2 +- .../layoutconfig}/StyleConfiguration.ts | 18 +++- .../{ => manager}/CommonStyleManager.ts | 2 +- .../{ => manager}/MultimodalInputManager.ts | 4 +- .../{ => manager}/ScreenLockManager.ts | 10 +-- .../{ => manager}/SwitchUserManager.ts | 8 +- .../ets/default/{ => manager}/TimeManager.ts | 12 +-- .../default/{ => manager}/TintStateManager.ts | 10 +-- .../{ => manager}/WindowPanelManager.ts | 10 +-- .../main/ets/default/model/SettingsModel.ts | 1 - .../uicomponents}/iconComponent.ets | 4 +- .../utils}/BundleParseUtil.ts | 4 +- .../ets/default/{ => utils}/DateTimeCommon.ts | 0 .../ets/default/{ => utils}/Decorators.ts | 2 +- .../ets/default/{event => utils}/EventBus.ts | 2 +- .../default/{event => utils}/EventManager.ts | 8 +- .../ets/default/{event => utils}/EventUtil.ts | 2 +- .../ets/default/{ => utils}/LunarCalendar.ts | 0 .../utils}/PluginComponentManagerUtil.ts | 4 +- .../ets/default/{ => utils}/ReadConfigUtil.ts | 2 +- .../ets/default/{ => utils}/ResourceUtil.ts | 2 +- .../default/{ => utils}/ScreenLockCommon.ts | 4 +- .../ets/default/{ => utils}/SettingsUtil.ts | 8 +- .../{ => utils}/SingleInstanceHelper.ts | 4 +- .../ets/default/{ => utils}/SysFaultLogger.ts | 2 +- common/src/main/ets/default/utils/Trace.ts | 15 +++- .../PluginDataSourceAdapter.ts | 2 +- .../PluginDataSourceManager.ts | 4 +- .../sourceloader/DataAbilitySourceLoader.ts | 4 +- .../sourceloader/MetaSourceLoader.ts | 6 +- .../sourceloader/PluginSourceLoader.ts | 4 +- .../sourceloader/PluginSourceLoaderPatch.ts | 4 +- .../sourceloader/SourceLoader.ts | 4 +- .../sourceloader/SourceLoaderFactory.ts | 2 +- .../ets/default/pages/airplaneComponent.ets | 2 +- .../ets/com/ohos/model/AutoRotateService.ts | 2 +- ...lCenterSimpleToggleAutoRotateComponent.ets | 2 +- .../ets/com/ohos/viewmodel/AutoRotateVM.ts | 2 +- .../src/main/ets/default/batteryModel.ts | 2 +- .../ets/default/common/StyleConfiguration.ts | 2 +- .../main/ets/default/pages/batteryIcon.ets | 2 +- .../src/main/ets/default/pages/batteryPic.ets | 2 +- .../src/main/ets/default/pages/batterySoc.ets | 4 +- .../main/ets/default/viewmodel/BatteryVM.ts | 6 +- .../ets/com/ohos/common/StyleConfiguration.ts | 2 +- .../ets/com/ohos/model/BluetoothService.ts | 2 +- ...lCenterComplexToggleBluetoothComponent.ets | 6 +- .../StatusBarIconItemBluetoothComponent.ets | 4 +- .../ets/com/ohos/viewmodel/BluetoothVM.ts | 6 +- .../src/main/ets/default/brightnessManager.ts | 4 +- .../ets/default/common/StyleConfiguration.ts | 2 +- .../ets/default/common/StyleConfiguration.ts | 2 +- .../main/ets/default/pages/CapsuleIcon.ets | 2 +- .../ets/default/viewmodel/CapsuleViewModel.ts | 4 +- .../ets/default/common/StyleConfiguration.ts | 2 +- .../src/main/ets/default/pages/clockIcon.ets | 8 +- .../src/main/ets/default/viewmodel/ClockVM.ts | 6 +- .../src/main/ets/com/ohos/common/Constants.ts | 2 +- .../ets/com/ohos/common/StyleConfiguration.ts | 2 +- .../com/ohos/model/ControlCenterService.ts | 10 +-- .../com/ohos/pages/ComplexToggleComponent.ets | 6 +- .../ohos/pages/ComplexToggleLoadComponent.ets | 2 +- .../ohos/pages/PluginIconItemComponent.ets | 6 +- .../com/ohos/pages/SimpleToggleComponent.ets | 6 +- .../ohos/pages/SimpleToggleLoadComponent.ets | 4 +- .../src/main/ets/com/ohos/pages/UpTitle.ets | 4 +- .../ets/com/ohos/viewmodel/ControlCenterVM.ts | 4 +- .../ets/com/ohos/view/component/dateTime.ets | 2 +- .../main/ets/com/ohos/vm/dateTimeViewModel.ts | 6 +- .../ets/com/ohos/common/StyleConfiguration.ts | 2 +- .../ets/com/ohos/model/LocationService.ts | 2 +- ...rolCenterSimpleToggleLocationComponent.ets | 6 +- .../StatusBarIconItemLocationComponent.ets | 4 +- .../main/ets/com/ohos/viewmodel/LocationVM.ts | 8 +- .../ets/com/ohos/model/bundleResourceModel.ts | 2 +- .../ets/com/ohos/model/noDisturbingModel.ts | 2 +- .../ohos/vm/noDisturbComponentViewModel.ts | 2 +- .../ets/com/ohos/common/StyleConfiguration.ts | 2 +- .../main/ets/com/ohos/model/NFCModeService.ts | 2 +- .../ControlCenterSimpleToggleNFComponent.ets | 2 +- .../pages/StatusBarIconItemNFComponent.ets | 4 +- .../main/ets/com/ohos/viewmodel/NFCModeVM.ts | 6 +- .../com/ohos/noticeItem/common/CommonUtil.ts | 2 +- .../noticeItem/model/NotificationConfig.ts | 2 +- .../noticeItem/model/NotificationService.ts | 4 +- .../model/NotificationWindowManager.ts | 4 +- .../ohos/noticeItem/model/ParseDataUtil.ts | 2 +- .../noticeItem/model/rule/RuleController.ts | 3 +- .../noticeItem/view/item/actionComponent.ets | 2 +- .../view/item/bannerNotificationItem.ets | 4 +- .../ohos/noticeItem/view/item/generalItem.ets | 3 +- .../ohos/noticeItem/view/item/pictureItem.ets | 1 - .../noticeItem/view/item/settingDialog.ets | 7 +- .../ohos/noticeItem/view/item/titleItem.ets | 3 +- .../viewmodel/NotificationViewModel.ts | 11 ++- .../src/main/ets/pages/noDisturb.ets | 2 +- .../src/main/ets/pages/DropdownPanel.ets | 14 +-- .../src/main/ets/pages/SCBDropdownPanel.ets | 2 +- .../src/main/ets/pages/bannerNotification.ets | 6 +- .../ets/pages/common/ControlCenterConfig.ts | 4 +- .../ets/pages/common/StyleConfiguration.ts | 2 +- .../src/main/ets/pages/common/StyleManager.ts | 2 +- .../src/main/ets/pages/control.ets | 2 +- .../src/main/ets/pages/notification.ets | 10 +-- .../src/main/ets/pages/SCBStatusBar.ets | 2 +- .../src/main/ets/pages/StatusBar.ets | 12 ++- .../main/ets/pages/common/StatusbarConfig.ts | 2 +- .../ets/pages/common/StyleConfiguration.ts | 2 +- .../ets/com/ohos/common/StyleConfiguration.ts | 2 +- .../ets/com/ohos/model/RingModeService.ts | 4 +- ...rolCenterSimpleToggleRingModeComponent.ets | 6 +- .../StatusBarIconItemRingModeComponent.ets | 4 +- .../main/ets/com/ohos/viewmodel/RingModeVM.ts | 6 +- .../main/ets/com/ohos/model/accountsModel.ts | 9 +- .../ets/com/ohos/model/screenLockModel.ts | 7 +- .../ets/com/ohos/model/screenLockService.ts | 9 +- .../ets/com/ohos/model/screenlockStyle.ts | 2 +- .../ets/com/ohos/view/component/accounts.ets | 2 +- .../ets/com/ohos/view/component/lockIcon.ets | 2 +- .../src/main/ets/com/ohos/vm/StatusBarVM.ts | 2 +- .../ets/com/ohos/vm/customPSDViewModel.ts | 3 +- .../ets/com/ohos/vm/digitalPSDViewModel.ts | 3 +- .../main/ets/com/ohos/vm/lockIconViewModel.ts | 2 +- .../main/ets/com/ohos/vm/mixedPSDViewModel.ts | 3 +- .../ets/default/common/StyleConfiguration.ts | 2 +- .../src/main/ets/default/pages/signalIcon.ets | 4 +- .../main/ets/default/viewmodel/SignalVM.ts | 6 +- .../src/main/ets/com/ohos/common/Constants.ts | 4 +- .../com/ohos/common/StatusBarConfiguration.ts | 4 +- .../ets/com/ohos/common/StyleConfiguration.ts | 2 +- .../ets/com/ohos/model/StatusBarService.ts | 10 +-- .../ets/com/ohos/pages/IconItemComponent.ets | 11 ++- .../com/ohos/pages/MetaIconItemComponent.ets | 9 +- .../ohos/pages/PluginIconItemComponent.ets | 6 +- .../ets/com/ohos/pages/StatusBarComponent.ets | 8 +- .../ets/com/ohos/viewmodel/StatusBarVM.ts | 18 ++-- .../src/main/ets/common/StyleConfiguration.ts | 2 +- .../src/main/ets/pages/SCBVolumePanel.ets | 2 +- .../ets/com/ohos/common/StyleConfiguration.ts | 2 +- .../com/ohos/common/VolumeWindowController.ts | 6 +- .../ets/com/ohos/model/VolumePanelService.ts | 6 +- .../ets/default/common/StyleConfiguration.ts | 2 +- .../main/ets/default/pages/wifiComponent.ets | 6 +- .../src/main/ets/default/pages/wifiIcon.ets | 4 +- .../src/main/ets/default/viewmodel/WifiVM.ts | 6 +- .../src/main/ets/MainAbility/MainAbility.ts | 16 +++- .../src/main/ets/WindowScene/HWSystemUi.ets | 2 +- .../screenlock/common/StyleConfiguration.ts | 2 +- .../ets/screenlock/pages/SCBScreenLock.ets | 9 +- .../ets/screenlock/pages/customPassword.ets | 5 +- .../ets/screenlock/pages/digitalPassword.ets | 5 +- .../ets/screenlock/pages/mixedPassword.ets | 5 +- .../ets/workers/PluginDataSourceWorker.js | 2 +- 167 files changed, 365 insertions(+), 545 deletions(-) delete mode 100644 common/src/main/ets/default/CheckEmptyUtils.ts delete mode 100644 common/src/main/ets/default/InitSystemUi.ts delete mode 100644 common/src/main/ets/default/StyleConfiguration.ts delete mode 100644 common/src/main/ets/default/Trace.ts rename common/src/main/ets/default/{interface => base}/DragArea.ts (100%) rename common/src/main/ets/default/{interface => base}/DragItemPosition.ts (100%) rename common/src/main/ets/{template => default/base}/SimpleToggleBase.ets (97%) rename common/src/main/ets/{template => default/base}/iconTitleBase.ets (93%) rename common/src/main/ets/default/{ => constants}/Constants.ts (100%) rename common/src/main/ets/{plugindatasource/common/Constants.ts => default/constants/PluginConstants.ts} (97%) rename common/src/main/ets/default/{heightcofigUtils => layoutconfig}/HeightConfigUtils.ts (96%) rename common/src/main/ets/{template/common => default/layoutconfig}/StyleConfiguration.ts (83%) rename common/src/main/ets/default/{ => manager}/CommonStyleManager.ts (97%) rename common/src/main/ets/default/{ => manager}/MultimodalInputManager.ts (97%) rename common/src/main/ets/default/{ => manager}/ScreenLockManager.ts (89%) rename common/src/main/ets/default/{ => manager}/SwitchUserManager.ts (94%) rename common/src/main/ets/default/{ => manager}/TimeManager.ts (92%) rename common/src/main/ets/default/{ => manager}/TintStateManager.ts (93%) rename common/src/main/ets/default/{ => manager}/WindowPanelManager.ts (94%) rename common/src/main/ets/{template => default/uicomponents}/iconComponent.ets (94%) rename common/src/main/ets/{plugindatasource/common => default/utils}/BundleParseUtil.ts (98%) rename common/src/main/ets/default/{ => utils}/DateTimeCommon.ts (100%) rename common/src/main/ets/default/{ => utils}/Decorators.ts (97%) rename common/src/main/ets/default/{event => utils}/EventBus.ts (98%) rename common/src/main/ets/default/{event => utils}/EventManager.ts (94%) rename common/src/main/ets/default/{event => utils}/EventUtil.ts (98%) rename common/src/main/ets/default/{ => utils}/LunarCalendar.ts (100%) rename common/src/main/ets/{plugindatasource/common => default/utils}/PluginComponentManagerUtil.ts (97%) rename common/src/main/ets/default/{ => utils}/ReadConfigUtil.ts (97%) rename common/src/main/ets/default/{ => utils}/ResourceUtil.ts (96%) rename common/src/main/ets/default/{ => utils}/ScreenLockCommon.ts (93%) rename common/src/main/ets/default/{ => utils}/SettingsUtil.ts (90%) rename common/src/main/ets/default/{ => utils}/SingleInstanceHelper.ts (90%) rename common/src/main/ets/default/{ => utils}/SysFaultLogger.ts (98%) diff --git a/common/index.ets b/common/index.ets index 80b6cda6..def2fa4c 100644 --- a/common/index.ets +++ b/common/index.ets @@ -83,8 +83,8 @@ export { FormListInfoCacheManager } from './src/main/ets/default/cache/FormList export { SettingItemsConfig } from './src/main/ets/default/configs/SettingItemsConfig' export { SettingItemsManager } from './src/main/ets/default/settings/SettingItemsManager' export { SettingItemOptionsChecker } from './src/main/ets/default/settings/SettingItemOptionsChecker' -export { DragArea } from './src/main/ets/default/interface/DragArea' -export { DragItemPosition } from './src/main/ets/default/interface/DragItemPosition' +export { DragArea } from './src/main/ets/default/base/DragArea' +export { DragItemPosition } from './src/main/ets/default/base/DragItemPosition' // Window scene export { HWRootSceneSession } from './src/main/ets/WindowScene/scene/session/HWRootSceneSession' diff --git a/common/src/main/ets/default/CheckEmptyUtils.ts b/common/src/main/ets/default/CheckEmptyUtils.ts deleted file mode 100644 index 5061c49c..00000000 --- a/common/src/main/ets/default/CheckEmptyUtils.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export default class CheckEmptyUtils { - - /** - * Check obj is empty. - * - * @param {Object} obj need checked object - * @return {boolean} true(empty) - */ - static isEmpty(obj) { - return (typeof obj === 'undefined' || obj === null || obj === '' || Object.keys(obj).length === 0); - } - - /** - * Check str is empty. - * - * @param {string} str need checked string - * @return {boolean} true(empty) - */ - static checkStrIsEmpty(str) { - return str.trim().length === 0; - } - - /** - * Check array is empty. - * - * @param {Array} arr need checked array - * @return {boolean} true(empty) - */ - static isEmptyArr(arr) { - return arr.length === 0; - } -} \ No newline at end of file diff --git a/common/src/main/ets/default/InitSystemUi.ts b/common/src/main/ets/default/InitSystemUi.ts deleted file mode 100644 index fedc3735..00000000 --- a/common/src/main/ets/default/InitSystemUi.ts +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import EventManager from './event/EventManager'; -import { Log } from './utils/Log'; -import ScreenLockManager from './ScreenLockManager'; -import ServiceExtensionContext from 'application/ServiceExtensionContext'; -import TimeManager from './TimeManager'; - -const TAG = 'initSystemui'; - -export default function initSystemUi(context: ServiceExtensionContext): void { - EventManager.setContext(context); - ScreenLockManager.init().then(() => { - }).catch(err => { - }); - TimeManager.init(context); - Log.showDebug(TAG, `init done, ctx: ${context}`); -} diff --git a/common/src/main/ets/default/StyleConfiguration.ts b/common/src/main/ets/default/StyleConfiguration.ts deleted file mode 100644 index 92370d8f..00000000 --- a/common/src/main/ets/default/StyleConfiguration.ts +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import CommonStyleManager from './CommonStyleManager'; -import deviceInfo from '@ohos.deviceInfo'; - -const TAG = 'Common-StyleConfiguration'; -const deviceTypeInfo = deviceInfo.deviceType; - -export class CommonStyle { - statusBarFontSize: Length = deviceTypeInfo === 'phone' ? '12fp' : '16fp'; - statusBarIconWidth: Length = '24vp'; - statusBarIconHeight: Length = '24vp'; - statusBarMarginLeftRight: Length = deviceTypeInfo === 'phone' ? '0vp' : $r("app.float.status_bar_margin_left_right"); - deviceTypeInfo = deviceTypeInfo; -} - -export default class StyleConfiguration { - static getCommonStyle(): CommonStyle { - const key: string = TAG + '-Common'; - return CommonStyleManager.getStyle(key, CommonStyle); - } -} \ No newline at end of file diff --git a/common/src/main/ets/default/Trace.ts b/common/src/main/ets/default/Trace.ts deleted file mode 100644 index d4d1ee65..00000000 --- a/common/src/main/ets/default/Trace.ts +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import byTrace from '@ohos.bytrace'; -import { Log } from './utils/Log'; - -/** - * Add method trace. Modify RECORD_TRACE before using. - */ -export default class Trace { - static readonly CORE_METHOD_START_DROPDOWNPANEL = 'startDropdownPanel'; - static readonly CORE_METHOD_START_TOUCHEVENT = 'startTouchEvent'; - static readonly CORE_METHOD_CLICK_CAPSULE = 'clickCapsuleEvent'; - static readonly CORE_METHOD_CLICK_NOTIFICATION = 'clickNotificationEvent'; - static readonly CORE_METHOD_START_VOLUMEPANEL = 'startVolumePanel'; - static readonly CORE_METHOD_UNLOCK_SCREEN = "unlockScreen" - static readonly CORE_METHOD_CALL_ACCOUNT_SYSTEM = "callAccountSubsystem"; - static readonly CORE_METHOD_PASS_ACCOUNT_SYSTEM_RESULT = "passingAccountSubsystemResult"; - static readonly CORE_METHOD_HIDE_PSD_PAGE = "hidePsdPage"; - static readonly CORE_METHOD_SHOW_LOCK_SCREEN = "showLockScreen"; - static readonly CORE_METHOD_SLEEP_TO_LOCK_SCREEN = "sleepToLockScreen" - - private static readonly TRACE_TAG = 'Systemui:Trace'; - private static readonly RECORD_TRACE = true; - private static readonly TRACE_LIMIT = 2000; - - private static readonly TRACE_BASE_INDEX = 10000; - - /** - * start trace method - * - * @param {string} methodName - methodName for tracing - */ - static start(methodName: string) { - if (!Trace.RECORD_TRACE) return; - if (typeof globalThis.taskIdMap === 'undefined' || typeof globalThis.traceIndex === 'undefined') { - Trace.init(); - } - let taskId = globalThis.taskIdMap.get(methodName); - if (taskId == undefined) { - taskId = globalThis.traceIndex; - globalThis.traceIndex++; - globalThis.taskIdMap.set(methodName, taskId); - } - Log.showInfo(this.TRACE_TAG, `start trace ${taskId}`); - byTrace.startTrace(this.TRACE_TAG + methodName, taskId, Trace.TRACE_LIMIT); - } - - private static init() { - Log.showInfo(this.TRACE_TAG, 'init trace parameters'); - globalThis.taskIdMap = new Map(); - globalThis.traceIndex = Trace.TRACE_BASE_INDEX; - } - - /** - * stop trace method - * - * @param {string} methodName - methodName for tracing - */ - static end(methodName: string) { - if (!Trace.RECORD_TRACE) return; - if (typeof globalThis.taskIdMap === 'undefined') { - return; - } - const taskId = globalThis.taskIdMap.get(methodName); - if (taskId == undefined) { - Log.showError(this.TRACE_TAG, `fail to end trace name ${methodName}`); - return; - } - Log.showInfo(this.TRACE_TAG, `end trace ${taskId}`); - byTrace.finishTrace(this.TRACE_TAG + methodName, taskId); - } -} \ No newline at end of file diff --git a/common/src/main/ets/default/abilitymanager/bundleManager.ts b/common/src/main/ets/default/abilitymanager/bundleManager.ts index 91191c5c..38ddc22d 100644 --- a/common/src/main/ets/default/abilitymanager/bundleManager.ts +++ b/common/src/main/ets/default/abilitymanager/bundleManager.ts @@ -15,7 +15,7 @@ import BundleMgr from "@ohos.bundle.bundleManager"; import { Log } from '../utils/Log'; -import SwitchUserManager from "../SwitchUserManager"; +import {SwitchUserManager} from "../manager/SwitchUserManager"; import AbilityManager from "./abilityManager"; const TAG = "BRManager"; diff --git a/common/src/main/ets/default/base/BaseDragHandler.ts b/common/src/main/ets/default/base/BaseDragHandler.ts index dd7c7abf..9e74ae83 100644 --- a/common/src/main/ets/default/base/BaseDragHandler.ts +++ b/common/src/main/ets/default/base/BaseDragHandler.ts @@ -14,7 +14,7 @@ */ import { Log } from '../utils/Log'; -import { DragArea } from '../interface/DragArea'; +import { DragArea } from './DragArea'; import { CommonConstants } from '../constants/CommonConstants'; const TAG = 'BaseDragHandler'; diff --git a/common/src/main/ets/default/interface/DragArea.ts b/common/src/main/ets/default/base/DragArea.ts similarity index 100% rename from common/src/main/ets/default/interface/DragArea.ts rename to common/src/main/ets/default/base/DragArea.ts diff --git a/common/src/main/ets/default/interface/DragItemPosition.ts b/common/src/main/ets/default/base/DragItemPosition.ts similarity index 100% rename from common/src/main/ets/default/interface/DragItemPosition.ts rename to common/src/main/ets/default/base/DragItemPosition.ts diff --git a/common/src/main/ets/template/SimpleToggleBase.ets b/common/src/main/ets/default/base/SimpleToggleBase.ets similarity index 97% rename from common/src/main/ets/template/SimpleToggleBase.ets rename to common/src/main/ets/default/base/SimpleToggleBase.ets index 91604136..ffc91d03 100644 --- a/common/src/main/ets/template/SimpleToggleBase.ets +++ b/common/src/main/ets/default/base/SimpleToggleBase.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { Log } from '../default/utils/Log' -import StyleConfiguration, { SimpleToggleBaseStyle } from './common/StyleConfiguration' +import { Log } from '../utils/Log' +import StyleConfiguration, { SimpleToggleBaseStyle } from '../layoutconfig/StyleConfiguration' const TAG = 'SimpleToggleBase' diff --git a/common/src/main/ets/template/iconTitleBase.ets b/common/src/main/ets/default/base/iconTitleBase.ets similarity index 93% rename from common/src/main/ets/template/iconTitleBase.ets rename to common/src/main/ets/default/base/iconTitleBase.ets index 95fb448e..5a212b09 100644 --- a/common/src/main/ets/template/iconTitleBase.ets +++ b/common/src/main/ets/default/base/iconTitleBase.ets @@ -13,9 +13,9 @@ * limitations under the License. */ -import { Log } from '../default/utils/Log' -import StyleConfiguration, { IconTitleBaseStyle } from './common/StyleConfiguration' -import iconComponent from './iconComponent' +import { Log } from '../utils/Log' +import StyleConfiguration, { IconTitleBaseStyle } from '../layoutconfig/StyleConfiguration' +import iconComponent from '../uicomponents/iconComponent' const TAG = 'iconTitleBase' diff --git a/common/src/main/ets/default/commonEvent/CommonEventManager.ts b/common/src/main/ets/default/commonEvent/CommonEventManager.ts index 90cb1fb8..a03f12d3 100644 --- a/common/src/main/ets/default/commonEvent/CommonEventManager.ts +++ b/common/src/main/ets/default/commonEvent/CommonEventManager.ts @@ -15,9 +15,9 @@ import commonEvent from "@ohos.commonEvent"; import { CommonEventData } from "commonEvent/commonEventData"; -import EventManager from "../event/EventManager"; +import EventManager from "../utils/EventManager"; import { Log } from '../utils/Log'; -import { SCREEN_CHANGE_EVENT } from "../ScreenLockManager"; +import { SCREEN_CHANGE_EVENT } from "../manager/ScreenLockManager"; export type CommonEventManager = { subscriberCommonEvent: () => Promise; diff --git a/common/src/main/ets/default/Constants.ts b/common/src/main/ets/default/constants/Constants.ts similarity index 100% rename from common/src/main/ets/default/Constants.ts rename to common/src/main/ets/default/constants/Constants.ts diff --git a/common/src/main/ets/plugindatasource/common/Constants.ts b/common/src/main/ets/default/constants/PluginConstants.ts similarity index 97% rename from common/src/main/ets/plugindatasource/common/Constants.ts rename to common/src/main/ets/default/constants/PluginConstants.ts index 2db0f695..d9d0191f 100644 --- a/common/src/main/ets/plugindatasource/common/Constants.ts +++ b/common/src/main/ets/default/constants/PluginConstants.ts @@ -13,9 +13,9 @@ * limitations under the License. */ -import { Event } from '../../default/event/EventUtil'; +import { Event } from '../utils/EventUtil'; -export default class Constants { +export default class PluginConstants { static readonly INIT_CONFIG = 'initConfig'; static readonly INIT_FINISH = 'initFinish'; static readonly CLEAR_ALL = 'clearAll'; diff --git a/common/src/main/ets/default/heightcofigUtils/HeightConfigUtils.ts b/common/src/main/ets/default/layoutconfig/HeightConfigUtils.ts similarity index 96% rename from common/src/main/ets/default/heightcofigUtils/HeightConfigUtils.ts rename to common/src/main/ets/default/layoutconfig/HeightConfigUtils.ts index a1df1a7b..2c2aa37d 100644 --- a/common/src/main/ets/default/heightcofigUtils/HeightConfigUtils.ts +++ b/common/src/main/ets/default/layoutconfig/HeightConfigUtils.ts @@ -19,7 +19,7 @@ const STATUS_BAR_COEFFICIENT = 1.0 const NAV_BAR_MIN_HEIGHT = 32 const NAV_BAR_COEFFICIENT = 1.0 -export default class HeightConfigUtils { +export class HeightConfigUtils { getStatusMinH(){ return STATUS_BAR_MIN_HEIGHT; diff --git a/common/src/main/ets/template/common/StyleConfiguration.ts b/common/src/main/ets/default/layoutconfig/StyleConfiguration.ts similarity index 83% rename from common/src/main/ets/template/common/StyleConfiguration.ts rename to common/src/main/ets/default/layoutconfig/StyleConfiguration.ts index 0c0e248b..ac6a388e 100644 --- a/common/src/main/ets/template/common/StyleConfiguration.ts +++ b/common/src/main/ets/default/layoutconfig/StyleConfiguration.ts @@ -13,10 +13,11 @@ * limitations under the License. */ -import CommonStyleManager from '../../default/CommonStyleManager'; +import CommonStyleManager from '../manager/CommonStyleManager'; +import deviceInfo from '@ohos.deviceInfo'; const TAG = 'CommonTemplate-StyleConfiguration'; - +const deviceTypeInfo = deviceInfo.deviceType; export class IconTitleBaseStyle { marginLeft: Length = '24vp'; marginRight: Length = '16vp'; @@ -69,6 +70,14 @@ export class SimpleToggleBaseStyle { transparentColor: ResourceColor = 'rgba(255, 255, 255, 0)'; } +export class CommonStyle { + statusBarFontSize: Length = deviceTypeInfo === 'phone' ? '12fp' : '16fp'; + statusBarIconWidth: Length = '24vp'; + statusBarIconHeight: Length = '24vp'; + statusBarMarginLeftRight: Length = deviceTypeInfo === 'phone' ? '0vp' : $r("app.float.status_bar_margin_left_right"); + deviceTypeInfo = deviceTypeInfo; +} + export default class StyleConfiguration { static getIconTitleBaseStyle(): IconTitleBaseStyle { const key: string = TAG + '-IconTitleBase'; @@ -84,4 +93,9 @@ export default class StyleConfiguration { const key: string = TAG + '-SimpleToggleBase'; return CommonStyleManager.getStyle(key, SimpleToggleBaseStyle); } + + static getCommonStyle(): CommonStyle { + const key: string = TAG + '-Common'; + return CommonStyleManager.getStyle(key, CommonStyle); + } } \ No newline at end of file diff --git a/common/src/main/ets/default/CommonStyleManager.ts b/common/src/main/ets/default/manager/CommonStyleManager.ts similarity index 97% rename from common/src/main/ets/default/CommonStyleManager.ts rename to common/src/main/ets/default/manager/CommonStyleManager.ts index 715a9894..d860b966 100644 --- a/common/src/main/ets/default/CommonStyleManager.ts +++ b/common/src/main/ets/default/manager/CommonStyleManager.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Log } from './utils/Log'; +import { Log } from '../utils/Log'; const TAG = "Common-StyleManager"; export class CommonStyleManager { diff --git a/common/src/main/ets/default/MultimodalInputManager.ts b/common/src/main/ets/default/manager/MultimodalInputManager.ts similarity index 97% rename from common/src/main/ets/default/MultimodalInputManager.ts rename to common/src/main/ets/default/manager/MultimodalInputManager.ts index 6c2494a5..93357738 100644 --- a/common/src/main/ets/default/MultimodalInputManager.ts +++ b/common/src/main/ets/default/manager/MultimodalInputManager.ts @@ -13,8 +13,8 @@ * limitations under the License. */ import inputConsumer from "@ohos.multimodalInput.inputConsumer"; -import { Log } from './utils/Log'; -import createOrGet from "./SingleInstanceHelper"; +import { Log } from '../utils/Log'; +import { createOrGet } from "../utils/SingleInstanceHelper"; export type MultiCallback = (keyOptions: inputConsumer.KeyOptions) => void; export enum MultiKeyCode { diff --git a/common/src/main/ets/default/ScreenLockManager.ts b/common/src/main/ets/default/manager/ScreenLockManager.ts similarity index 89% rename from common/src/main/ets/default/ScreenLockManager.ts rename to common/src/main/ets/default/manager/ScreenLockManager.ts index 6ba2ac5f..49276d6d 100644 --- a/common/src/main/ets/default/ScreenLockManager.ts +++ b/common/src/main/ets/default/manager/ScreenLockManager.ts @@ -15,11 +15,11 @@ import commonEvent from '@ohos.commonEvent'; import { CommonEventSubscriber } from 'commonEvent/commonEventSubscriber'; -import createOrGet from './SingleInstanceHelper'; -import EventManager from './event/EventManager'; -import { Log } from './utils/Log'; -import { obtainLocalEvent } from './event/EventUtil'; -import { debounce } from './Decorators'; +import { createOrGet } from '../utils/SingleInstanceHelper'; +import EventManager from '../utils/EventManager'; +import { Log } from '../utils/Log'; +import { obtainLocalEvent } from '../utils/EventUtil'; +import { debounce } from '../utils/Decorators'; export const SCREEN_CHANGE_EVENT = 'screenChangeEvent'; diff --git a/common/src/main/ets/default/SwitchUserManager.ts b/common/src/main/ets/default/manager/SwitchUserManager.ts similarity index 94% rename from common/src/main/ets/default/SwitchUserManager.ts rename to common/src/main/ets/default/manager/SwitchUserManager.ts index e86862e3..2e1c0c52 100644 --- a/common/src/main/ets/default/SwitchUserManager.ts +++ b/common/src/main/ets/default/manager/SwitchUserManager.ts @@ -14,8 +14,8 @@ */ import AccountManager from "@ohos.account.osAccount"; -import { Log } from './utils/Log'; -import getSingleInstance from "./SingleInstanceHelper"; +import { Log } from '../utils/Log'; +import { createOrGet } from "../utils/SingleInstanceHelper"; const TAG = "SwitchUserManager"; const SUBSCRIBE_KEY = "SystemUiAccount"; @@ -58,13 +58,13 @@ function parseAccountInfo(accountInfo: AccountInfo): UserInfo { }; } -export default class SwitchUserManager { +export class SwitchUserManager { mUserInfo: UserInfo = new UserInfo(); mListeners = new Set(); mHasWait: boolean = false; static getInstance(): SwitchUserManager { - return getSingleInstance(SwitchUserManager, TAG); + return createOrGet(SwitchUserManager, TAG); } constructor() { diff --git a/common/src/main/ets/default/TimeManager.ts b/common/src/main/ets/default/manager/TimeManager.ts similarity index 92% rename from common/src/main/ets/default/TimeManager.ts rename to common/src/main/ets/default/manager/TimeManager.ts index 78b77c0f..f981b399 100644 --- a/common/src/main/ets/default/TimeManager.ts +++ b/common/src/main/ets/default/manager/TimeManager.ts @@ -17,12 +17,12 @@ import settings from "@ohos.settings"; import commonEvent from "@ohos.commonEvent"; import dataShare from '@ohos.data.dataShare'; -import { Log } from './utils/Log'; -import EventManager from "./event/EventManager"; -import createOrGet from "./SingleInstanceHelper"; -import { obtainLocalEvent } from "./event/EventUtil"; -import Constants from "./Constants"; -import { CommonEventManager, getCommonEventManager, POLICY } from "./commonEvent/CommonEventManager"; +import { Log } from '../utils/Log'; +import EventManager from "../utils/EventManager"; +import { createOrGet } from "../utils/SingleInstanceHelper"; +import { obtainLocalEvent } from "../utils/EventUtil"; +import Constants from "../constants/Constants"; +import { CommonEventManager, getCommonEventManager, POLICY } from "../commonEvent/CommonEventManager"; export const TIME_CHANGE_EVENT = "Time_Change_Event"; diff --git a/common/src/main/ets/default/TintStateManager.ts b/common/src/main/ets/default/manager/TintStateManager.ts similarity index 93% rename from common/src/main/ets/default/TintStateManager.ts rename to common/src/main/ets/default/manager/TintStateManager.ts index 86f3c25a..eb1aaa2f 100644 --- a/common/src/main/ets/default/TintStateManager.ts +++ b/common/src/main/ets/default/manager/TintStateManager.ts @@ -16,9 +16,9 @@ // TODO Window import Window from '@ohos.window'; import display from '@ohos.display'; -import { Log } from './utils/Log'; -import { WindowType, Rect, getWindowName } from './Constants'; -import getSingleInstance from './SingleInstanceHelper'; +import { Log } from '../utils/Log'; +import { WindowType, Rect, getWindowName } from '../constants/Constants'; +import { createOrGet } from '../utils/SingleInstanceHelper'; const TAG = 'TintStateManager'; const LISTENER_SYSTEM_BAR_TINT_CHANGE = 'systemBarTintChange'; @@ -45,12 +45,12 @@ export function getOrCreateTintContentInfo(key: string): TintContentInfo { return AppStorage.Get(storageKey); } -export default class TintStateManager { +export class TintStateManager { mListeners: Map = new Map(); mStates: Map = new Map(); static getInstance(): TintStateManager { - return getSingleInstance(TintStateManager, TAG); + return createOrGet(TintStateManager, TAG); } constructor() { diff --git a/common/src/main/ets/default/WindowPanelManager.ts b/common/src/main/ets/default/manager/WindowPanelManager.ts similarity index 94% rename from common/src/main/ets/default/WindowPanelManager.ts rename to common/src/main/ets/default/manager/WindowPanelManager.ts index db8f1ea1..238bd200 100644 --- a/common/src/main/ets/default/WindowPanelManager.ts +++ b/common/src/main/ets/default/manager/WindowPanelManager.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import { Log } from './utils/Log'; -import EventManager from './event/EventManager'; -import { obtainLocalEvent } from './event/EventUtil'; -import { Rect } from './Constants'; -import createOrGet from './SingleInstanceHelper'; +import { Log } from '../utils/Log'; +import EventManager from '../utils/EventManager'; +import { obtainLocalEvent } from '../utils/EventUtil'; +import { Rect } from '../constants/Constants'; +import { createOrGet } from '../utils/SingleInstanceHelper'; export type WindowInfo = { visibility: boolean; diff --git a/common/src/main/ets/default/model/SettingsModel.ts b/common/src/main/ets/default/model/SettingsModel.ts index 2dfaed40..e327fb3b 100644 --- a/common/src/main/ets/default/model/SettingsModel.ts +++ b/common/src/main/ets/default/model/SettingsModel.ts @@ -12,7 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { DataAbilityHelper } from 'ability/dataAbilityHelper'; import { Log } from '../utils/Log'; import FileUtils from '../utils/FileUtils'; diff --git a/common/src/main/ets/template/iconComponent.ets b/common/src/main/ets/default/uicomponents/iconComponent.ets similarity index 94% rename from common/src/main/ets/template/iconComponent.ets rename to common/src/main/ets/default/uicomponents/iconComponent.ets index 1b7c8723..9f9f315c 100644 --- a/common/src/main/ets/template/iconComponent.ets +++ b/common/src/main/ets/default/uicomponents/iconComponent.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { Log } from '../default/utils/Log' -import StyleConfiguration, { IconComponentStyle } from './common/StyleConfiguration' +import { Log } from '../utils/Log' +import StyleConfiguration, { IconComponentStyle } from '../layoutconfig/StyleConfiguration' const TAG = 'iconComponent' diff --git a/common/src/main/ets/plugindatasource/common/BundleParseUtil.ts b/common/src/main/ets/default/utils/BundleParseUtil.ts similarity index 98% rename from common/src/main/ets/plugindatasource/common/BundleParseUtil.ts rename to common/src/main/ets/default/utils/BundleParseUtil.ts index 0432fd5e..5815844e 100644 --- a/common/src/main/ets/plugindatasource/common/BundleParseUtil.ts +++ b/common/src/main/ets/default/utils/BundleParseUtil.ts @@ -19,8 +19,8 @@ import { AbilityInfo } from 'bundleManager/AbilityInfo'; import { ExtensionAbilityInfo } from 'bundleManager/ExtensionAbilityInfo'; import { CustomizeData } from 'bundle/customizeData'; import { Metadata } from 'bundleManager/Metadata'; -import { Log } from '../../default/utils/Log'; -import switchUserManager from '../../default/SwitchUserManager'; +import { Log } from './Log'; +import switchUserManager from '../manager/SwitchUserManager'; export type AbilityInfoWithId = (AbilityInfo | ExtensionAbilityInfo) & { itemId: string }; export type BundleListener = { diff --git a/common/src/main/ets/default/DateTimeCommon.ts b/common/src/main/ets/default/utils/DateTimeCommon.ts similarity index 100% rename from common/src/main/ets/default/DateTimeCommon.ts rename to common/src/main/ets/default/utils/DateTimeCommon.ts diff --git a/common/src/main/ets/default/Decorators.ts b/common/src/main/ets/default/utils/Decorators.ts similarity index 97% rename from common/src/main/ets/default/Decorators.ts rename to common/src/main/ets/default/utils/Decorators.ts index 26661eef..c6f44729 100644 --- a/common/src/main/ets/default/Decorators.ts +++ b/common/src/main/ets/default/utils/Decorators.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Log } from './utils/Log'; +import { Log } from './Log'; const TAG = 'Decorators'; diff --git a/common/src/main/ets/default/event/EventBus.ts b/common/src/main/ets/default/utils/EventBus.ts similarity index 98% rename from common/src/main/ets/default/event/EventBus.ts rename to common/src/main/ets/default/utils/EventBus.ts index 586fcb86..7b06e078 100644 --- a/common/src/main/ets/default/event/EventBus.ts +++ b/common/src/main/ets/default/utils/EventBus.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Log } from '../utils/Log'; +import { Log } from './Log'; export type Callback = (args: any) => void; const TAG = "EventBus"; diff --git a/common/src/main/ets/default/event/EventManager.ts b/common/src/main/ets/default/utils/EventManager.ts similarity index 94% rename from common/src/main/ets/default/event/EventManager.ts rename to common/src/main/ets/default/utils/EventManager.ts index aff83de3..7f8efbff 100644 --- a/common/src/main/ets/default/event/EventManager.ts +++ b/common/src/main/ets/default/utils/EventManager.ts @@ -14,13 +14,13 @@ */ import ServiceExtensionContext from "application/ServiceExtensionContext"; -import { Log } from '../utils/Log'; -import createOrGet from "../SingleInstanceHelper"; +import { Log } from './Log'; +import { createOrGet } from "./SingleInstanceHelper"; import { EventParser, START_ABILITY_EVENT, Event, LocalEvent } from "./EventUtil"; import { Callback, createEventBus, EventBus } from "./EventBus"; import { BusinessError } from 'basic'; -import {PluginType} from "../../plugindatasource/common/Constants"; -import {writeFaultLog, FaultID} from '../SysFaultLogger'; +import {PluginType} from "../constants/PluginConstants"; +import {writeFaultLog, FaultID} from './SysFaultLogger'; import { launcherAbilityManager } from '../manager/LauncherAbilityManager'; export type unsubscribe = () => void; diff --git a/common/src/main/ets/default/event/EventUtil.ts b/common/src/main/ets/default/utils/EventUtil.ts similarity index 98% rename from common/src/main/ets/default/event/EventUtil.ts rename to common/src/main/ets/default/utils/EventUtil.ts index 8e64cd48..7ac5b076 100644 --- a/common/src/main/ets/default/event/EventUtil.ts +++ b/common/src/main/ets/default/utils/EventUtil.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Log } from '../utils/Log'; +import { Log } from './Log'; export type EventTarget = "local" | "remote" | "ability" | "commonEvent"; export type Event = { diff --git a/common/src/main/ets/default/LunarCalendar.ts b/common/src/main/ets/default/utils/LunarCalendar.ts similarity index 100% rename from common/src/main/ets/default/LunarCalendar.ts rename to common/src/main/ets/default/utils/LunarCalendar.ts diff --git a/common/src/main/ets/plugindatasource/common/PluginComponentManagerUtil.ts b/common/src/main/ets/default/utils/PluginComponentManagerUtil.ts similarity index 97% rename from common/src/main/ets/plugindatasource/common/PluginComponentManagerUtil.ts rename to common/src/main/ets/default/utils/PluginComponentManagerUtil.ts index 4ae6cd62..d35c5e9e 100644 --- a/common/src/main/ets/plugindatasource/common/PluginComponentManagerUtil.ts +++ b/common/src/main/ets/default/utils/PluginComponentManagerUtil.ts @@ -16,8 +16,8 @@ import pluginComponentManager from '@ohos.pluginComponent'; import { Want } from 'ability/want'; -import { ItemComponentData } from './Constants'; -import { Log } from '../../default/utils/Log'; +import { ItemComponentData } from '../constants/PluginConstants'; +import { Log } from './Log'; const TAG = 'PluginComponentManagerUtil'; diff --git a/common/src/main/ets/default/ReadConfigUtil.ts b/common/src/main/ets/default/utils/ReadConfigUtil.ts similarity index 97% rename from common/src/main/ets/default/ReadConfigUtil.ts rename to common/src/main/ets/default/utils/ReadConfigUtil.ts index 217dcf1e..f9e06e97 100644 --- a/common/src/main/ets/default/ReadConfigUtil.ts +++ b/common/src/main/ets/default/utils/ReadConfigUtil.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Log } from './utils/Log'; +import { Log } from './Log'; import FileIo from '@ohos.fileio'; const DFAULT_SIZE = 4096; diff --git a/common/src/main/ets/default/ResourceUtil.ts b/common/src/main/ets/default/utils/ResourceUtil.ts similarity index 96% rename from common/src/main/ets/default/ResourceUtil.ts rename to common/src/main/ets/default/utils/ResourceUtil.ts index 9f57e18c..3859ca74 100644 --- a/common/src/main/ets/default/ResourceUtil.ts +++ b/common/src/main/ets/default/utils/ResourceUtil.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityManager from './abilitymanager/abilityManager' +import AbilityManager from '../abilitymanager/abilityManager' /** * Resource util diff --git a/common/src/main/ets/default/ScreenLockCommon.ts b/common/src/main/ets/default/utils/ScreenLockCommon.ts similarity index 93% rename from common/src/main/ets/default/ScreenLockCommon.ts rename to common/src/main/ets/default/utils/ScreenLockCommon.ts index 8f5fc4a2..33303b8b 100644 --- a/common/src/main/ets/default/ScreenLockCommon.ts +++ b/common/src/main/ets/default/utils/ScreenLockCommon.ts @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Log } from './utils/Log'; -import AbilityManager from '../default/abilitymanager/abilityManager' +import { Log } from './Log'; +import AbilityManager from '../abilitymanager/abilityManager' const TAG = 'ScreenLock-ScreenLockCommon'; export enum ScreenLockStatus { diff --git a/common/src/main/ets/default/SettingsUtil.ts b/common/src/main/ets/default/utils/SettingsUtil.ts similarity index 90% rename from common/src/main/ets/default/SettingsUtil.ts rename to common/src/main/ets/default/utils/SettingsUtil.ts index 897b06cc..334d20f1 100644 --- a/common/src/main/ets/default/SettingsUtil.ts +++ b/common/src/main/ets/default/utils/SettingsUtil.ts @@ -15,11 +15,11 @@ */ import settings from '@ohos.settings'; -import { Log } from './utils/Log'; -import Constants from './Constants'; -import createOrGet from './SingleInstanceHelper'; +import { Log } from './Log'; +import Constants from '../constants/Constants'; +import { createOrGet } from './SingleInstanceHelper'; import Context from 'application/ServiceExtensionContext'; -import AbilityManager from './abilitymanager/abilityManager'; +import AbilityManager from '../abilitymanager/abilityManager'; const TAG = 'SettingsUtil'; diff --git a/common/src/main/ets/default/SingleInstanceHelper.ts b/common/src/main/ets/default/utils/SingleInstanceHelper.ts similarity index 90% rename from common/src/main/ets/default/SingleInstanceHelper.ts rename to common/src/main/ets/default/utils/SingleInstanceHelper.ts index c9178421..a77f563d 100644 --- a/common/src/main/ets/default/SingleInstanceHelper.ts +++ b/common/src/main/ets/default/utils/SingleInstanceHelper.ts @@ -13,13 +13,13 @@ * limitations under the License. */ -import { Log } from './utils/Log'; +import { Log } from './Log'; import audio from '@ohos.multimedia.audio'; const TAG = 'SingleInstanceHelper'; const AUDIO_MANAGER_KEY = 'MultiMediaAudioManager'; -export default function createOrGet(objectClass: { new(): T }, storageKey: string): T { +export function createOrGet(objectClass: { new(): T }, storageKey: string): T { if (!globalThis[storageKey]) { globalThis[storageKey] = new objectClass(); Log.showInfo(TAG, `Create key of ${storageKey}`); diff --git a/common/src/main/ets/default/SysFaultLogger.ts b/common/src/main/ets/default/utils/SysFaultLogger.ts similarity index 98% rename from common/src/main/ets/default/SysFaultLogger.ts rename to common/src/main/ets/default/utils/SysFaultLogger.ts index 3403eaec..4ef5f8d6 100644 --- a/common/src/main/ets/default/SysFaultLogger.ts +++ b/common/src/main/ets/default/utils/SysFaultLogger.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Log } from './utils/Log'; +import { Log } from './Log'; import hiSysEvent from '@ohos.hiSysEvent' const TAG = 'SystemFaultLogger'; diff --git a/common/src/main/ets/default/utils/Trace.ts b/common/src/main/ets/default/utils/Trace.ts index 9ec8d048..86d0b9fa 100644 --- a/common/src/main/ets/default/utils/Trace.ts +++ b/common/src/main/ets/default/utils/Trace.ts @@ -29,7 +29,20 @@ export class Trace { static readonly CORE_METHOD_START_APP_ANIMATION = 'startAppAnimation'; static readonly CORE_METHOD_CLOSE_APP_ANIMATION = 'closeAppAnimation'; - private static readonly TRACE_TAG = 'L:Trace'; + //systemUI trace + static readonly CORE_METHOD_START_DROPDOWNPANEL = 'startDropdownPanel'; + static readonly CORE_METHOD_START_TOUCHEVENT = 'startTouchEvent'; + static readonly CORE_METHOD_CLICK_CAPSULE = 'clickCapsuleEvent'; + static readonly CORE_METHOD_CLICK_NOTIFICATION = 'clickNotificationEvent'; + static readonly CORE_METHOD_START_VOLUMEPANEL = 'startVolumePanel'; + static readonly CORE_METHOD_UNLOCK_SCREEN = "unlockScreen" + static readonly CORE_METHOD_CALL_ACCOUNT_SYSTEM = "callAccountSubsystem"; + static readonly CORE_METHOD_PASS_ACCOUNT_SYSTEM_RESULT = "passingAccountSubsystemResult"; + static readonly CORE_METHOD_HIDE_PSD_PAGE = "hidePsdPage"; + static readonly CORE_METHOD_SHOW_LOCK_SCREEN = "showLockScreen"; + static readonly CORE_METHOD_SLEEP_TO_LOCK_SCREEN = "sleepToLockScreen" + + private static readonly TRACE_TAG = 'SceneBoard:Trace'; private static readonly RECORD_TRACE = true; private static readonly TRACE_LIMIT = 2000; diff --git a/common/src/main/ets/plugindatasource/PluginDataSourceAdapter.ts b/common/src/main/ets/plugindatasource/PluginDataSourceAdapter.ts index ba27aea9..bc0a5151 100644 --- a/common/src/main/ets/plugindatasource/PluginDataSourceAdapter.ts +++ b/common/src/main/ets/plugindatasource/PluginDataSourceAdapter.ts @@ -17,7 +17,7 @@ import worker from '@ohos.worker'; import { Log } from '../default/utils/Log'; import BundleManager from '../default/abilitymanager/bundleManager'; import { Want } from 'ability/want'; -import Constants, { ItemComponentData, obtainMsg, RootConfigInfo } from './common/Constants'; +import Constants, { ItemComponentData, obtainMsg, RootConfigInfo } from '../default/constants/PluginConstants'; import ServiceExtensionContext from 'application/ServiceExtensionContext'; import PluginSourceLoaderPatch from './sourceloader/PluginSourceLoaderPatch' diff --git a/common/src/main/ets/plugindatasource/PluginDataSourceManager.ts b/common/src/main/ets/plugindatasource/PluginDataSourceManager.ts index 357308be..ac56b68a 100644 --- a/common/src/main/ets/plugindatasource/PluginDataSourceManager.ts +++ b/common/src/main/ets/plugindatasource/PluginDataSourceManager.ts @@ -17,14 +17,14 @@ import { Log } from '../default/utils/Log'; import SourceLoaderFactory from './sourceloader/SourceLoaderFactory'; import SourceLoader from './sourceloader/SourceLoader'; import PluginSourceLoader from './sourceloader/PluginSourceLoader'; -import { FilterData, ItemComponentData, RootConfigInfo } from './common/Constants'; +import { FilterData, ItemComponentData, RootConfigInfo } from '../default/constants/PluginConstants'; import { AbilityInfoWithId, BundleEventType, ListenerHandle, queryAbility, registerBundleListener, -} from './common/BundleParseUtil'; +} from '../default/utils/BundleParseUtil'; import { AbilityInfo } from 'bundle/abilityInfo'; import { ExtensionAbilityInfo } from 'bundleManager/ExtensionAbilityInfo'; diff --git a/common/src/main/ets/plugindatasource/sourceloader/DataAbilitySourceLoader.ts b/common/src/main/ets/plugindatasource/sourceloader/DataAbilitySourceLoader.ts index 78e5565e..7297ba13 100644 --- a/common/src/main/ets/plugindatasource/sourceloader/DataAbilitySourceLoader.ts +++ b/common/src/main/ets/plugindatasource/sourceloader/DataAbilitySourceLoader.ts @@ -14,8 +14,8 @@ */ import { Log } from '../../default/utils/Log'; -import { AbilityInfoWithId } from '../common/BundleParseUtil'; -import { LoaderConfigInfo } from '../common/Constants'; +import { AbilityInfoWithId } from '../../default/utils/BundleParseUtil'; +import { LoaderConfigInfo } from '../../default/constants/PluginConstants'; import SourceLoader from './SourceLoader'; const TAG = 'DataAbilitySourceLoader'; diff --git a/common/src/main/ets/plugindatasource/sourceloader/MetaSourceLoader.ts b/common/src/main/ets/plugindatasource/sourceloader/MetaSourceLoader.ts index cbdfce0d..996889a2 100644 --- a/common/src/main/ets/plugindatasource/sourceloader/MetaSourceLoader.ts +++ b/common/src/main/ets/plugindatasource/sourceloader/MetaSourceLoader.ts @@ -15,9 +15,9 @@ import { Log } from '../../default/utils/Log'; import SourceLoader from './SourceLoader'; -import Constants, { PluginType, ItemComponentData, LoaderConfigInfo } from '../common/Constants'; -import { AbilityInfoWithId, filterAbilityInfo, PluginData } from '../common/BundleParseUtil'; -import { parseEventString } from '../../default/event/EventUtil'; +import Constants, { PluginType, ItemComponentData, LoaderConfigInfo } from '../../default/constants/PluginConstants'; +import { AbilityInfoWithId, filterAbilityInfo, PluginData } from '../../default/utils/BundleParseUtil'; +import { parseEventString } from '../../default/utils/EventUtil'; const TAG = 'MetaSourceLoader'; diff --git a/common/src/main/ets/plugindatasource/sourceloader/PluginSourceLoader.ts b/common/src/main/ets/plugindatasource/sourceloader/PluginSourceLoader.ts index ad2caafa..9058f793 100644 --- a/common/src/main/ets/plugindatasource/sourceloader/PluginSourceLoader.ts +++ b/common/src/main/ets/plugindatasource/sourceloader/PluginSourceLoader.ts @@ -15,8 +15,8 @@ import { Log } from '../../default/utils/Log'; import SourceLoader from './SourceLoader'; -import Constants, { PluginType, ItemComponentData, LoaderConfigInfo, PluginComponentData } from '../common/Constants'; -import { AbilityInfoWithId, filterAbilityInfo, PluginData } from '../common/BundleParseUtil'; +import Constants, { PluginType, ItemComponentData, LoaderConfigInfo, PluginComponentData } from '../../default/constants/PluginConstants'; +import { AbilityInfoWithId, filterAbilityInfo, PluginData } from '../../default/utils/BundleParseUtil'; const TAG = 'PluginSourceLoader'; diff --git a/common/src/main/ets/plugindatasource/sourceloader/PluginSourceLoaderPatch.ts b/common/src/main/ets/plugindatasource/sourceloader/PluginSourceLoaderPatch.ts index d8c1844c..dc7752dc 100644 --- a/common/src/main/ets/plugindatasource/sourceloader/PluginSourceLoaderPatch.ts +++ b/common/src/main/ets/plugindatasource/sourceloader/PluginSourceLoaderPatch.ts @@ -15,9 +15,9 @@ import { Want } from 'ability/want'; import { Log } from '../../default/utils/Log'; -import { ItemComponentData } from '../common/Constants'; +import { ItemComponentData } from '../../default/constants/PluginConstants'; import { ListenerHandle, registerPushListener, requestFunction, PluginComponentInfo -} from '../common/PluginComponentManagerUtil'; +} from '../../default/utils/PluginComponentManagerUtil'; const TAG = 'PluginSourceLoaderPatch'; diff --git a/common/src/main/ets/plugindatasource/sourceloader/SourceLoader.ts b/common/src/main/ets/plugindatasource/sourceloader/SourceLoader.ts index 151f3c50..bdfc1b44 100644 --- a/common/src/main/ets/plugindatasource/sourceloader/SourceLoader.ts +++ b/common/src/main/ets/plugindatasource/sourceloader/SourceLoader.ts @@ -14,8 +14,8 @@ */ import { Log } from '../../default/utils/Log'; -import { ItemComponentData, LoaderConfigInfo } from '../common/Constants'; -import { AbilityInfoWithId } from '../common/BundleParseUtil'; +import { ItemComponentData, LoaderConfigInfo } from '../../default/constants/PluginConstants'; +import { AbilityInfoWithId } from '../../default/utils/BundleParseUtil'; const TAG = 'SourceLoader'; diff --git a/common/src/main/ets/plugindatasource/sourceloader/SourceLoaderFactory.ts b/common/src/main/ets/plugindatasource/sourceloader/SourceLoaderFactory.ts index dfa5f6c4..714f3593 100644 --- a/common/src/main/ets/plugindatasource/sourceloader/SourceLoaderFactory.ts +++ b/common/src/main/ets/plugindatasource/sourceloader/SourceLoaderFactory.ts @@ -18,7 +18,7 @@ import SourceLoader, { LoaderChannel } from './SourceLoader'; import DataAbilitySourceLoader from './DataAbilitySourceLoader'; import MetaSourceLoader from './MetaSourceLoader'; import PluginSourceLoader from './PluginSourceLoader'; -import { LoaderConfigInfo } from '../common/Constants'; +import { LoaderConfigInfo } from '../../default/constants/PluginConstants'; const TAG = 'SourceLoaderFactory'; diff --git a/feature/systemui/airplanecomponent/src/main/ets/default/pages/airplaneComponent.ets b/feature/systemui/airplanecomponent/src/main/ets/default/pages/airplaneComponent.ets index c6047d5b..52fdc52c 100644 --- a/feature/systemui/airplanecomponent/src/main/ets/default/pages/airplaneComponent.ets +++ b/feature/systemui/airplanecomponent/src/main/ets/default/pages/airplaneComponent.ets @@ -15,7 +15,7 @@ import wifi from '@ohos.wifi'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import iconTitleBase from '@ohos/common/src/main/ets/template/iconTitleBase'; +import iconTitleBase from '@ohos/common/src/main/ets/default/base/iconTitleBase'; const TAG = 'Control-airPlaneComponent'; diff --git a/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/model/AutoRotateService.ts b/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/model/AutoRotateService.ts index 7931a8d5..3e69aaf3 100644 --- a/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/model/AutoRotateService.ts +++ b/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/model/AutoRotateService.ts @@ -16,7 +16,7 @@ import screen from '@ohos.screen'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; const TAG = 'AutoRotateModel'; diff --git a/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleAutoRotateComponent.ets b/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleAutoRotateComponent.ets index 18851040..a8b1c768 100644 --- a/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleAutoRotateComponent.ets +++ b/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleAutoRotateComponent.ets @@ -16,7 +16,7 @@ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import {AutoRotateData} from '../common/Constants'; import ViewModel from '../viewmodel/AutoRotateVM'; -import SimpleToggleBase from '@ohos/common/src/main/ets/template/SimpleToggleBase'; +import SimpleToggleBase from '@ohos/common/src/main/ets/default/base/SimpleToggleBase'; const TAG = 'autorotate-ControlCenterSimpleToggleAutoRotateComponent'; diff --git a/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/viewmodel/AutoRotateVM.ts b/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/viewmodel/AutoRotateVM.ts index 096733b1..5f3093d4 100644 --- a/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/viewmodel/AutoRotateVM.ts +++ b/feature/systemui/autorotatecomponent/src/main/ets/com/ohos/viewmodel/AutoRotateVM.ts @@ -14,7 +14,7 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +import {createOrGet} from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; import AutoRotateService from '../model/AutoRotateService'; import { AutoRotateData } from '../common/Constants'; diff --git a/feature/systemui/batterycomponent/src/main/ets/default/batteryModel.ts b/feature/systemui/batterycomponent/src/main/ets/default/batteryModel.ts index f4f1ac28..a16a1ea3 100644 --- a/feature/systemui/batterycomponent/src/main/ets/default/batteryModel.ts +++ b/feature/systemui/batterycomponent/src/main/ets/default/batteryModel.ts @@ -15,7 +15,7 @@ import BatteryInfo from "@ohos.batteryInfo"; import commonEvent from "@ohos.commonEvent"; -import createOrGet from "@ohos/common/src/main/ets/default/SingleInstanceHelper"; +import { createOrGet } from "@ohos/common/src/main/ets/default/utils/SingleInstanceHelper"; import Constants from "./common/constants"; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import {CommonEventManager, getCommonEventManager, POLICY} from "@ohos/common/src/main/ets/default/commonEvent/CommonEventManager"; diff --git a/feature/systemui/batterycomponent/src/main/ets/default/common/StyleConfiguration.ts b/feature/systemui/batterycomponent/src/main/ets/default/common/StyleConfiguration.ts index 14bf63e5..6308ed98 100644 --- a/feature/systemui/batterycomponent/src/main/ets/default/common/StyleConfiguration.ts +++ b/feature/systemui/batterycomponent/src/main/ets/default/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; const TAG = 'battery-StyleConfiguration'; diff --git a/feature/systemui/batterycomponent/src/main/ets/default/pages/batteryIcon.ets b/feature/systemui/batterycomponent/src/main/ets/default/pages/batteryIcon.ets index 2343e9c5..b3f38e66 100644 --- a/feature/systemui/batterycomponent/src/main/ets/default/pages/batteryIcon.ets +++ b/feature/systemui/batterycomponent/src/main/ets/default/pages/batteryIcon.ets @@ -19,7 +19,7 @@ import BatterySoc from './batterySoc'; import Constants from '../common/constants'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration' +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration' import StyleConfiguration, { BatteryComponentStyle } from '../common/StyleConfiguration' const TAG = 'BatteryComponent-batteryIcon'; diff --git a/feature/systemui/batterycomponent/src/main/ets/default/pages/batteryPic.ets b/feature/systemui/batterycomponent/src/main/ets/default/pages/batteryPic.ets index 008fcaf9..5ab707e8 100644 --- a/feature/systemui/batterycomponent/src/main/ets/default/pages/batteryPic.ets +++ b/feature/systemui/batterycomponent/src/main/ets/default/pages/batteryPic.ets @@ -15,7 +15,7 @@ import Constants from '../common/constants' import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager' +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager' import StyleConfiguration, { BatteryPicStyle } from '../common/StyleConfiguration' import ViewModel from '../viewmodel/BatteryVM' diff --git a/feature/systemui/batterycomponent/src/main/ets/default/pages/batterySoc.ets b/feature/systemui/batterycomponent/src/main/ets/default/pages/batterySoc.ets index 25d781db..0086b1c6 100644 --- a/feature/systemui/batterycomponent/src/main/ets/default/pages/batterySoc.ets +++ b/feature/systemui/batterycomponent/src/main/ets/default/pages/batterySoc.ets @@ -15,8 +15,8 @@ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration'; -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager'; +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration'; +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager'; import ViewModel from '../viewmodel/BatteryVM'; const TAG = 'BatteryComponent-batterySoc'; diff --git a/feature/systemui/batterycomponent/src/main/ets/default/viewmodel/BatteryVM.ts b/feature/systemui/batterycomponent/src/main/ets/default/viewmodel/BatteryVM.ts index 4dd4790a..d696ff4d 100644 --- a/feature/systemui/batterycomponent/src/main/ets/default/viewmodel/BatteryVM.ts +++ b/feature/systemui/batterycomponent/src/main/ets/default/viewmodel/BatteryVM.ts @@ -14,10 +14,10 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants'; +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants'; import { TintContentInfo, getOrCreateTintContentInfo -} from '@ohos/common/src/main/ets/default/TintStateManager'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +} from '@ohos/common/src/main/ets/default/manager/TintStateManager'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; const TAG = 'BatteryVM'; diff --git a/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts b/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts index 4c3f812b..eec24c6e 100644 --- a/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts +++ b/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; const TAG = 'bluetooth-StyleConfiguration'; diff --git a/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/model/BluetoothService.ts b/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/model/BluetoothService.ts index cc67123b..5f7bad45 100644 --- a/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/model/BluetoothService.ts +++ b/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/model/BluetoothService.ts @@ -15,7 +15,7 @@ import bluetooth from '@ohos.bluetooth'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; const TAG = 'BluetoothModel'; diff --git a/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/pages/ControlCenterComplexToggleBluetoothComponent.ets b/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/pages/ControlCenterComplexToggleBluetoothComponent.ets index 4b2dfa54..c45d1853 100644 --- a/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/pages/ControlCenterComplexToggleBluetoothComponent.ets +++ b/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/pages/ControlCenterComplexToggleBluetoothComponent.ets @@ -14,10 +14,10 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import EventManager from "@ohos/common/src/main/ets/default/event/EventManager"; -import {obtainStartAbility} from "@ohos/common/src/main/ets/default/event/EventUtil"; +import EventManager from "@ohos/common/src/main/ets/default/utils/EventManager"; +import {obtainStartAbility} from "@ohos/common/src/main/ets/default/utils/EventUtil"; import ViewModel from '../viewmodel/BluetoothVM'; -import iconTitleBase from '@ohos/common/src/main/ets/template/iconTitleBase'; +import iconTitleBase from '@ohos/common/src/main/ets/default/base/iconTitleBase'; const TAG = 'bluetooth-ControlCenterComplexToggleBluetoothComponent'; diff --git a/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/pages/StatusBarIconItemBluetoothComponent.ets b/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/pages/StatusBarIconItemBluetoothComponent.ets index ede830b4..3fbdc5f6 100644 --- a/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/pages/StatusBarIconItemBluetoothComponent.ets +++ b/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/pages/StatusBarIconItemBluetoothComponent.ets @@ -14,9 +14,9 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager'; +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager'; import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration'; +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration'; import StyleConfiguration, { StatusBarBluetoothComponentStyle } from '../common/StyleConfiguration'; import Constants from '../common/Constants'; import ViewModel from '../viewmodel/BluetoothVM'; diff --git a/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/viewmodel/BluetoothVM.ts b/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/viewmodel/BluetoothVM.ts index 5f3573dc..3faa5607 100644 --- a/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/viewmodel/BluetoothVM.ts +++ b/feature/systemui/bluetoothcomponent/src/main/ets/com/ohos/viewmodel/BluetoothVM.ts @@ -14,10 +14,10 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants'; +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants'; import { TintContentInfo, getOrCreateTintContentInfo -} from '@ohos/common/src/main/ets/default/TintStateManager'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +} from '@ohos/common/src/main/ets/default/manager/TintStateManager'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; import BluetoothService from '../model/BluetoothService'; export const BLUETOOTH_OPEN_STATUS_KEY = 'BluetoothOpenStatus'; diff --git a/feature/systemui/brightnesscomponent/src/main/ets/default/brightnessManager.ts b/feature/systemui/brightnesscomponent/src/main/ets/default/brightnessManager.ts index 6c2b9131..0b18280e 100644 --- a/feature/systemui/brightnesscomponent/src/main/ets/default/brightnessManager.ts +++ b/feature/systemui/brightnesscomponent/src/main/ets/default/brightnessManager.ts @@ -22,8 +22,8 @@ import systemParameter from '@ohos.systemparameter' import dataShare from '@ohos.data.dataShare'; import Brightness from '@ohos.brightness'; import Context from 'application/ServiceExtensionContext'; -import Constants from "@ohos/common/src/main/ets/default/Constants"; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +import Constants from "@ohos/common/src/main/ets/default/constants/Constants"; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; const TAG = 'Control-brightnessManager'; var mBrightnessValue = AppStorage.SetAndLink('BrightnessValue', 100); diff --git a/feature/systemui/brightnesscomponent/src/main/ets/default/common/StyleConfiguration.ts b/feature/systemui/brightnesscomponent/src/main/ets/default/common/StyleConfiguration.ts index 722f222a..b8423434 100644 --- a/feature/systemui/brightnesscomponent/src/main/ets/default/common/StyleConfiguration.ts +++ b/feature/systemui/brightnesscomponent/src/main/ets/default/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; const TAG = 'brightness-StyleConfiguration'; diff --git a/feature/systemui/capsulecomponent/src/main/ets/default/common/StyleConfiguration.ts b/feature/systemui/capsulecomponent/src/main/ets/default/common/StyleConfiguration.ts index aa9203c0..ab2cef89 100644 --- a/feature/systemui/capsulecomponent/src/main/ets/default/common/StyleConfiguration.ts +++ b/feature/systemui/capsulecomponent/src/main/ets/default/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; import Constants from './constants'; const TAG = 'capsule-StyleConfiguration'; diff --git a/feature/systemui/capsulecomponent/src/main/ets/default/pages/CapsuleIcon.ets b/feature/systemui/capsulecomponent/src/main/ets/default/pages/CapsuleIcon.ets index 290e251b..7abb4f96 100644 --- a/feature/systemui/capsulecomponent/src/main/ets/default/pages/CapsuleIcon.ets +++ b/feature/systemui/capsulecomponent/src/main/ets/default/pages/CapsuleIcon.ets @@ -17,7 +17,7 @@ import Constants from '../common/constants' import CapsuleViewModel, { VIEW_MODEL_ID, CallState } from '../viewmodel/CapsuleViewModel' import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration' +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration' import StyleConfiguration, { CapsuleComponentStyle } from '../common/StyleConfiguration' const TAG = "CapsuleIcon"; diff --git a/feature/systemui/capsulecomponent/src/main/ets/default/viewmodel/CapsuleViewModel.ts b/feature/systemui/capsulecomponent/src/main/ets/default/viewmodel/CapsuleViewModel.ts index e51cc662..22711df9 100644 --- a/feature/systemui/capsulecomponent/src/main/ets/default/viewmodel/CapsuleViewModel.ts +++ b/feature/systemui/capsulecomponent/src/main/ets/default/viewmodel/CapsuleViewModel.ts @@ -16,8 +16,8 @@ import CapsuleModel from '../model/CapsuleModel'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; -import ResourceUtil from '@ohos/common/src/main/ets/default/ResourceUtil'; -import Trace from '@ohos/common/src/main/ets/default/Trace' +import ResourceUtil from '@ohos/common/src/main/ets/default/utils/ResourceUtil'; +import { Trace } from '@ohos/common/src/main/ets/default/utils/Trace' let sCapsuleViewModel; diff --git a/feature/systemui/clockcomponent/src/main/ets/default/common/StyleConfiguration.ts b/feature/systemui/clockcomponent/src/main/ets/default/common/StyleConfiguration.ts index 70622f89..6771ff0c 100644 --- a/feature/systemui/clockcomponent/src/main/ets/default/common/StyleConfiguration.ts +++ b/feature/systemui/clockcomponent/src/main/ets/default/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; const TAG = 'clock-StyleConfiguration'; diff --git a/feature/systemui/clockcomponent/src/main/ets/default/pages/clockIcon.ets b/feature/systemui/clockcomponent/src/main/ets/default/pages/clockIcon.ets index 92a77353..72512b52 100644 --- a/feature/systemui/clockcomponent/src/main/ets/default/pages/clockIcon.ets +++ b/feature/systemui/clockcomponent/src/main/ets/default/pages/clockIcon.ets @@ -14,16 +14,16 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager' +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager' import StyleConfiguration, { ClockComponentStyle } from '../common/StyleConfiguration' import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration' +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration' import ViewModel from '../viewmodel/ClockVM' import TimeManager, { TimeEventArgs, TIME_CHANGE_EVENT, -} from '@ohos/common/src/main/ets/default/TimeManager' -import EventManager, { unsubscribe } from '@ohos/common/src/main/ets/default/event/EventManager' +} from '@ohos/common/src/main/ets/default/manager/TimeManager' +import EventManager, { unsubscribe } from '@ohos/common/src/main/ets/default/utils/EventManager' const TAG = 'ClockComponent-clockIcon'; diff --git a/feature/systemui/clockcomponent/src/main/ets/default/viewmodel/ClockVM.ts b/feature/systemui/clockcomponent/src/main/ets/default/viewmodel/ClockVM.ts index ace0b88d..13951e68 100644 --- a/feature/systemui/clockcomponent/src/main/ets/default/viewmodel/ClockVM.ts +++ b/feature/systemui/clockcomponent/src/main/ets/default/viewmodel/ClockVM.ts @@ -14,10 +14,10 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants'; +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants'; import { TintContentInfo, getOrCreateTintContentInfo -} from '@ohos/common/src/main/ets/default/TintStateManager'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +} from '@ohos/common/src/main/ets/default/manager/TintStateManager'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; const TAG = 'ClockVM'; diff --git a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/common/Constants.ts b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/common/Constants.ts index 4962c051..589647cf 100644 --- a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/common/Constants.ts +++ b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/common/Constants.ts @@ -14,7 +14,7 @@ */ import { ItemComponentData, FilterData -} from '@ohos/common/src/main/ets/plugindatasource/common/Constants'; +} from '@ohos/common/src/main/ets/default/constants/PluginConstants'; export default class Constants { static readonly TOUCHTYPE_DOWN = 0; diff --git a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts index ee02a5a6..fbd26abe 100644 --- a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts +++ b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; import Constants from './Constants'; const TAG = 'ControlCenter-StyleConfiguration'; diff --git a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/model/ControlCenterService.ts b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/model/ControlCenterService.ts index 50d21b13..04a022c2 100644 --- a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/model/ControlCenterService.ts +++ b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/model/ControlCenterService.ts @@ -14,14 +14,14 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; -import SwitchUserManager, { UserInfo } from '@ohos/common/src/main/ets/default/SwitchUserManager'; -import CheckEmptyUtils from '@ohos/common/src/main/ets/default/CheckEmptyUtils'; -import SettingsUtil from '@ohos/common/src/main/ets/default/SettingsUtil'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; +import { SwitchUserManager, UserInfo } from '@ohos/common/src/main/ets/default/manager/SwitchUserManager'; +import { CheckEmptyUtils } from '@ohos/common/src/main/ets/default/utils/CheckEmptyUtils'; +import SettingsUtil from '@ohos/common/src/main/ets/default/utils/SettingsUtil'; import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; import PluginDataSourceAdapter from '@ohos/common/src/main/ets/plugindatasource/PluginDataSourceAdapter'; import { ItemComponentData, FilterData -} from '@ohos/common/src/main/ets/plugindatasource/common/Constants'; +} from '@ohos/common/src/main/ets/default/constants/PluginConstants'; import Constants, { ControlComponentData, ControlCenterConfig } from '../common/Constants'; export interface ControlCenterListener { diff --git a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/ComplexToggleComponent.ets b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/ComplexToggleComponent.ets index ef623235..af8733a1 100644 --- a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/ComplexToggleComponent.ets +++ b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/ComplexToggleComponent.ets @@ -14,9 +14,9 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import EventManager from '@ohos/common/src/main/ets/default/event/EventManager'; -import iconTitleBase from '@ohos/common/src/main/ets/template/iconTitleBase'; -import { itemData } from "@ohos/common/src/main/ets/plugindatasource/common/Constants" +import EventManager from '@ohos/common/src/main/ets/default/utils/EventManager'; +import iconTitleBase from '@ohos/common/src/main/ets/default/base/iconTitleBase'; +import { itemData } from "@ohos/common/src/main/ets/default/constants/PluginConstants" const TAG = 'ComplexToggleComponent'; diff --git a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/ComplexToggleLoadComponent.ets b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/ComplexToggleLoadComponent.ets index b8ce520b..35b72030 100644 --- a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/ComplexToggleLoadComponent.ets +++ b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/ComplexToggleLoadComponent.ets @@ -14,7 +14,7 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import {FASlotName} from '@ohos/common/src/main/ets/default/Constants'; +import {FASlotName} from '@ohos/common/src/main/ets/default/constants/Constants'; import AirPlaneComponent from "@ohos/airplanecomponent/src/main/ets/default/pages/airplaneComponent"; import WifiComponent from '@ohos/wificomponent/src/main/ets/default/pages/wifiComponent'; import BluetoothComponent from '@ohos/bluetoothcomponent/src/main/ets/com/ohos/pages/ControlCenterComplexToggleBluetoothComponent'; diff --git a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/PluginIconItemComponent.ets b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/PluginIconItemComponent.ets index 5a62645f..b357d0c7 100644 --- a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/PluginIconItemComponent.ets +++ b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/PluginIconItemComponent.ets @@ -14,10 +14,10 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager'; -import { PluginComponentData } from "@ohos/common/src/main/ets/plugindatasource/common/Constants"; +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager'; +import { PluginComponentData } from "@ohos/common/src/main/ets/default/constants/PluginConstants"; import ViewModel from '../viewmodel/ControlCenterVM'; -import StyleConfiguration from '@ohos/common/src/main/ets/template/common/StyleConfiguration'; +import StyleConfiguration from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration'; const TAG = 'PluginIconItemComponent'; diff --git a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/SimpleToggleComponent.ets b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/SimpleToggleComponent.ets index 880fe1e3..429c6207 100644 --- a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/SimpleToggleComponent.ets +++ b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/SimpleToggleComponent.ets @@ -14,10 +14,10 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import EventManager from '@ohos/common/src/main/ets/default/event/EventManager'; -import SimpleToggleBase from '@ohos/common/src/main/ets/template/SimpleToggleBase'; +import EventManager from '@ohos/common/src/main/ets/default/utils/EventManager'; +import SimpleToggleBase from '@ohos/common/src/main/ets/default/base/SimpleToggleBase'; import PluginIconItemComponent from './PluginIconItemComponent'; -import {PluginType,itemData} from "@ohos/common/src/main/ets/plugindatasource/common/Constants" +import {PluginType,itemData} from "@ohos/common/src/main/ets/default/constants/PluginConstants" const TAG = 'SimpleToggleComponent'; diff --git a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/SimpleToggleLoadComponent.ets b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/SimpleToggleLoadComponent.ets index 4bf687c7..fd935e6c 100644 --- a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/SimpleToggleLoadComponent.ets +++ b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/SimpleToggleLoadComponent.ets @@ -13,9 +13,9 @@ * limitations under the License. */ -import {isNfcAvailable} from '@ohos/common/src/main/ets/default/Constants'; +import {isNfcAvailable} from '@ohos/common/src/main/ets/default/constants/Constants'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import {FASlotName} from '@ohos/common/src/main/ets/default/Constants'; +import {FASlotName} from '@ohos/common/src/main/ets/default/constants/Constants'; import LocationComponent from '@ohos/locationcomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleLocationComponent'; import RingModeComponent from '@ohos/ringmodecomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleRingModeComponent'; import AutoRotateComponent from '@ohos/autorotatecomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleAutoRotateComponent'; diff --git a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/UpTitle.ets b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/UpTitle.ets index 064f6c15..1af60d99 100644 --- a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/UpTitle.ets +++ b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/pages/UpTitle.ets @@ -14,8 +14,8 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import EventManager from "@ohos/common/src/main/ets/default/event/EventManager"; -import { obtainStartAbility } from "@ohos/common/src/main/ets/default/event/EventUtil"; +import EventManager from "@ohos/common/src/main/ets/default/utils/EventManager"; +import { obtainStartAbility } from "@ohos/common/src/main/ets/default/utils/EventUtil"; import Constants from '../common/Constants'; import StyleConfiguration, { ControlCenterUpTitleStyle } from '../common/StyleConfiguration'; diff --git a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/viewmodel/ControlCenterVM.ts b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/viewmodel/ControlCenterVM.ts index 7c0d546d..a503cd00 100644 --- a/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/viewmodel/ControlCenterVM.ts +++ b/feature/systemui/controlcentercomponent/src/main/ets/com/ohos/viewmodel/ControlCenterVM.ts @@ -14,11 +14,11 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; import { ControlComponentData, ControlCenterConfig } from '../common/Constants'; import ControlCenterService from '../model/ControlCenterService'; import { PluginType, PluginComponentData -} from '@ohos/common/src/main/ets/plugindatasource/common/Constants'; +} from '@ohos/common/src/main/ets/default/constants/PluginConstants'; export const CONTROL_CENTER_COMPLEX_TOGGLE_LAYOUT_KEY = 'ControlCenterComplexToggleLayout'; diff --git a/feature/systemui/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime.ets b/feature/systemui/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime.ets index e6fc464f..94ce365a 100644 --- a/feature/systemui/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime.ets +++ b/feature/systemui/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime.ets @@ -16,7 +16,7 @@ import { Log } from '@ohos/common/src/main/ets/default/utils/Log' import ViewModel from '../../vm/dateTimeViewModel' import Constants from '../../common/constants' -import { ScreenLockStatus } from '@ohos/common/src/main/ets/default/ScreenLockCommon' +import { ScreenLockStatus } from '@ohos/common/src/main/ets/default/utils/ScreenLockCommon' import deviceInfo from '@ohos.deviceInfo'; import i18n from '@ohos.i18n'; diff --git a/feature/systemui/datetimecomponent/src/main/ets/com/ohos/vm/dateTimeViewModel.ts b/feature/systemui/datetimecomponent/src/main/ets/com/ohos/vm/dateTimeViewModel.ts index 414a2509..ec28ac1b 100644 --- a/feature/systemui/datetimecomponent/src/main/ets/com/ohos/vm/dateTimeViewModel.ts +++ b/feature/systemui/datetimecomponent/src/main/ets/com/ohos/vm/dateTimeViewModel.ts @@ -16,10 +16,10 @@ import featureAbility from '@ohos.ability.featureAbility' import commonEvent from '@ohos.commonEvent'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log' -import DateTimeCommon from '@ohos/common/src/main/ets/default/DateTimeCommon' +import DateTimeCommon from '@ohos/common/src/main/ets/default/utils/DateTimeCommon' import sTimeManager, {TimeEventArgs, TIME_CHANGE_EVENT, -} from '@ohos/common/src/main/ets/default/TimeManager'; -import EventManager, {unsubscribe} from '@ohos/common/src/main/ets/default/event/EventManager' +} from '@ohos/common/src/main/ets/default/manager/TimeManager'; +import EventManager, {unsubscribe} from '@ohos/common/src/main/ets/default/utils/EventManager' const TAG = 'ScreenLock-DateTimeViewModel' diff --git a/feature/systemui/locationcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts b/feature/systemui/locationcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts index a4db19b0..a961e690 100644 --- a/feature/systemui/locationcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts +++ b/feature/systemui/locationcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; const TAG = 'location-StyleConfiguration'; diff --git a/feature/systemui/locationcomponent/src/main/ets/com/ohos/model/LocationService.ts b/feature/systemui/locationcomponent/src/main/ets/com/ohos/model/LocationService.ts index 9e189e59..31a6b641 100644 --- a/feature/systemui/locationcomponent/src/main/ets/com/ohos/model/LocationService.ts +++ b/feature/systemui/locationcomponent/src/main/ets/com/ohos/model/LocationService.ts @@ -15,7 +15,7 @@ import geolocation from '@ohos.geoLocationManager'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; const TAG = 'LocationModel'; diff --git a/feature/systemui/locationcomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleLocationComponent.ets b/feature/systemui/locationcomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleLocationComponent.ets index e108346f..bb6c65c2 100644 --- a/feature/systemui/locationcomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleLocationComponent.ets +++ b/feature/systemui/locationcomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleLocationComponent.ets @@ -14,11 +14,11 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import EventManager from "@ohos/common/src/main/ets/default/event/EventManager"; -import {obtainStartAbility} from "@ohos/common/src/main/ets/default/event/EventUtil"; +import EventManager from "@ohos/common/src/main/ets/default/utils/EventManager"; +import {obtainStartAbility} from "@ohos/common/src/main/ets/default/utils/EventUtil"; import {LocationData} from '../common/Constants'; import ViewModel from '../viewmodel/LocationVM'; -import SimpleToggleBase from '@ohos/common/src/main/ets/template/SimpleToggleBase'; +import SimpleToggleBase from '@ohos/common/src/main/ets/default/base/SimpleToggleBase'; const TAG = 'location-ControlCenterSimpleToggleLocationComponent'; diff --git a/feature/systemui/locationcomponent/src/main/ets/com/ohos/pages/StatusBarIconItemLocationComponent.ets b/feature/systemui/locationcomponent/src/main/ets/com/ohos/pages/StatusBarIconItemLocationComponent.ets index e643975f..367f7e1c 100644 --- a/feature/systemui/locationcomponent/src/main/ets/com/ohos/pages/StatusBarIconItemLocationComponent.ets +++ b/feature/systemui/locationcomponent/src/main/ets/com/ohos/pages/StatusBarIconItemLocationComponent.ets @@ -14,9 +14,9 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager'; +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager'; import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration'; +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration'; import StyleConfiguration, { StartsBarLocationComponentStyle } from '../common/StyleConfiguration'; import Constants from '../common/Constants'; import ViewModel from '../viewmodel/LocationVM'; diff --git a/feature/systemui/locationcomponent/src/main/ets/com/ohos/viewmodel/LocationVM.ts b/feature/systemui/locationcomponent/src/main/ets/com/ohos/viewmodel/LocationVM.ts index 727021c3..2ebd431a 100644 --- a/feature/systemui/locationcomponent/src/main/ets/com/ohos/viewmodel/LocationVM.ts +++ b/feature/systemui/locationcomponent/src/main/ets/com/ohos/viewmodel/LocationVM.ts @@ -14,11 +14,11 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import SwitchUserManager from '@ohos/common/src/main/ets/default/SwitchUserManager'; -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants'; +import { SwitchUserManager } from '@ohos/common/src/main/ets/default/manager/SwitchUserManager'; +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants'; import { TintContentInfo, getOrCreateTintContentInfo -} from '@ohos/common/src/main/ets/default/TintStateManager'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +} from '@ohos/common/src/main/ets/default/manager/TintStateManager'; +import {createOrGet} from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; import { LocationData } from '../common/Constants'; import LocationService from '../model/LocationService'; diff --git a/feature/systemui/managementcomponent/src/main/ets/com/ohos/model/bundleResourceModel.ts b/feature/systemui/managementcomponent/src/main/ets/com/ohos/model/bundleResourceModel.ts index ad73f89e..d2d17355 100644 --- a/feature/systemui/managementcomponent/src/main/ets/com/ohos/model/bundleResourceModel.ts +++ b/feature/systemui/managementcomponent/src/main/ets/com/ohos/model/bundleResourceModel.ts @@ -20,7 +20,7 @@ import Bundle from '@ohos.bundle'; import { BundleInfo } from 'bundle/bundleInfo'; import ResMgr from '@ohos.resourceManager'; import {BusinessError} from 'basic'; -import SwitchUserManager from '@ohos/common/src/main/ets/default/SwitchUserManager'; +import SwitchUserManager from '@ohos/common/src/main/ets/default/manager/SwitchUserManager'; const INDEX = 0; const IS_INCLUDE_ABILITY_INFO = 0; diff --git a/feature/systemui/managementcomponent/src/main/ets/com/ohos/model/noDisturbingModel.ts b/feature/systemui/managementcomponent/src/main/ets/com/ohos/model/noDisturbingModel.ts index 94db1b5f..43697439 100644 --- a/feature/systemui/managementcomponent/src/main/ets/com/ohos/model/noDisturbingModel.ts +++ b/feature/systemui/managementcomponent/src/main/ets/com/ohos/model/noDisturbingModel.ts @@ -15,7 +15,7 @@ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import Notification from '@ohos.notification'; import {DoNotDisturbType} from '../common/constants'; -import TimeManager from '@ohos/common/src/main/ets/default/TimeManager'; +import TimeManager from '@ohos/common/src/main/ets/default/manager/TimeManager'; const TAG = 'NotificationManagenment-NoDisturbingModel'; const MK_DATE_SPLIT = '-'; diff --git a/feature/systemui/managementcomponent/src/main/ets/com/ohos/vm/noDisturbComponentViewModel.ts b/feature/systemui/managementcomponent/src/main/ets/com/ohos/vm/noDisturbComponentViewModel.ts index 6f769dbf..ba9ee133 100644 --- a/feature/systemui/managementcomponent/src/main/ets/com/ohos/vm/noDisturbComponentViewModel.ts +++ b/feature/systemui/managementcomponent/src/main/ets/com/ohos/vm/noDisturbComponentViewModel.ts @@ -15,7 +15,7 @@ import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import ResourceUtil from '@ohos/common/src/main/ets/default/ResourceUtil'; +import ResourceUtil from '@ohos/common/src/main/ets/default/utils/ResourceUtil'; import NoDisturbingModel from '../model/noDisturbingModel'; import ConfigData, {DoNotDisturbType} from '../common/constants'; diff --git a/feature/systemui/nfccomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts b/feature/systemui/nfccomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts index 56837f3b..3b844383 100644 --- a/feature/systemui/nfccomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts +++ b/feature/systemui/nfccomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; const TAG = 'capsule-StyleConfiguration'; diff --git a/feature/systemui/nfccomponent/src/main/ets/com/ohos/model/NFCModeService.ts b/feature/systemui/nfccomponent/src/main/ets/com/ohos/model/NFCModeService.ts index 5f64a6e2..46716a8c 100644 --- a/feature/systemui/nfccomponent/src/main/ets/com/ohos/model/NFCModeService.ts +++ b/feature/systemui/nfccomponent/src/main/ets/com/ohos/model/NFCModeService.ts @@ -16,7 +16,7 @@ import NfcController from '@ohos.nfc.controller'; import { BusinessError } from 'basic'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; const TAG = 'NFCModel'; diff --git a/feature/systemui/nfccomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleNFComponent.ets b/feature/systemui/nfccomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleNFComponent.ets index 43b109b2..cb0b91e8 100644 --- a/feature/systemui/nfccomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleNFComponent.ets +++ b/feature/systemui/nfccomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleNFComponent.ets @@ -16,7 +16,7 @@ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import NfcController from '@ohos.nfc.controller'; import ViewModel from '../viewmodel/NFCModeVM'; -import SimpleToggleBase from '@ohos/common/src/main/ets/template/SimpleToggleBase'; +import SimpleToggleBase from '@ohos/common/src/main/ets/default/base/SimpleToggleBase'; const TAG = 'nfcmode-ControlCenterSimpleToggleNFComponent'; diff --git a/feature/systemui/nfccomponent/src/main/ets/com/ohos/pages/StatusBarIconItemNFComponent.ets b/feature/systemui/nfccomponent/src/main/ets/com/ohos/pages/StatusBarIconItemNFComponent.ets index 817c80a5..e6f626f9 100644 --- a/feature/systemui/nfccomponent/src/main/ets/com/ohos/pages/StatusBarIconItemNFComponent.ets +++ b/feature/systemui/nfccomponent/src/main/ets/com/ohos/pages/StatusBarIconItemNFComponent.ets @@ -14,9 +14,9 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager'; +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager'; import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration'; +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration'; import StyleConfiguration, { StatusRingModeComponentStyle } from '../common/StyleConfiguration'; import NfcController from '@ohos.nfc.controller'; import ViewModel from '../viewmodel/NFCModeVM'; diff --git a/feature/systemui/nfccomponent/src/main/ets/com/ohos/viewmodel/NFCModeVM.ts b/feature/systemui/nfccomponent/src/main/ets/com/ohos/viewmodel/NFCModeVM.ts index 08fa46b9..3f8afb13 100644 --- a/feature/systemui/nfccomponent/src/main/ets/com/ohos/viewmodel/NFCModeVM.ts +++ b/feature/systemui/nfccomponent/src/main/ets/com/ohos/viewmodel/NFCModeVM.ts @@ -15,10 +15,10 @@ import parameter from '@ohos.systemparameter' import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants'; +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants'; import { TintContentInfo, getOrCreateTintContentInfo -} from '@ohos/common/src/main/ets/default/TintStateManager'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +} from '@ohos/common/src/main/ets/default/manager/TintStateManager'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; import NFCModeService from '../model/NFCModeService'; import NfcController from '@ohos.nfc.controller'; diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/common/CommonUtil.ts b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/common/CommonUtil.ts index ae38bd2f..e261b6d3 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/common/CommonUtil.ts +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/common/CommonUtil.ts @@ -14,7 +14,7 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import Trace from '@ohos/common/src/main/ets/default/Trace' +import {Trace }from '@ohos/common/src/main/ets/default/utils/Trace' import WantAgent from '@ohos.wantAgent'; const TAG = 'CommonUtil'; diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationConfig.ts b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationConfig.ts index ce205c0d..27fe4135 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationConfig.ts +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationConfig.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import ReadConfigUtil from '@ohos/common/src/main/ets/default/ReadConfigUtil'; +import ReadConfigUtil from '@ohos/common/src/main/ets/default/utils/ReadConfigUtil'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; const TAG = 'NotificationConfig'; diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationService.ts b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationService.ts index 247a56a7..c75052d8 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationService.ts +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationService.ts @@ -18,10 +18,10 @@ import NotificationManager from './NotificationManager'; import ParseDataUtil from './ParseDataUtil'; import RuleController from './rule/RuleController'; import CommonUtil from '../common/CommonUtil'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; import DistributionManager from './NotificationDistributionManager'; import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; -import {writeFaultLog, FaultID} from '@ohos/common/src/main/ets/default/SysFaultLogger'; +import {writeFaultLog, FaultID} from '@ohos/common/src/main/ets/default/utils/SysFaultLogger'; const TAG = 'NotificationService'; diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationWindowManager.ts b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationWindowManager.ts index 2a83543d..800b190a 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationWindowManager.ts +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationWindowManager.ts @@ -14,8 +14,8 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import EventManager from '@ohos/common/src/main/ets/default/event/EventManager'; -import {obtainLocalEvent} from '@ohos/common/src/main/ets/default/event/EventUtil'; +import EventManager from '@ohos/common/src/main/ets/default/utils/EventManager'; +import {obtainLocalEvent} from '@ohos/common/src/main/ets/default/utils/EventUtil'; const TAG = 'NotificationWindowManager'; diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts index a9c48ef9..48367a2f 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts @@ -24,7 +24,7 @@ import DistributionManager from './NotificationDistributionManager'; import NotificationManager from './NotificationManager'; import Constants, {NotificationItemData} from '../common/constants'; import {NotificationConfig} from './NotificationConfig'; -import TimeManager from '@ohos/common/src/main/ets/default/TimeManager' +import TimeManager from '@ohos/common/src/main/ets/default/manager/TimeManager' const TAG = 'Notification_ParseDataUtil'; let mDate = new Date(); diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/rule/RuleController.ts b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/rule/RuleController.ts index 761f4a3c..a617cc6e 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/rule/RuleController.ts +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/rule/RuleController.ts @@ -16,7 +16,7 @@ import {NotificationItemData} from '../../common/constants'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import Notification from '@ohos.notification'; -import CheckEmptyUtils from '@ohos/common/src/main/ets/default/CheckEmptyUtils'; +import { CheckEmptyUtils } from '@ohos/common/src/main/ets/default/utils/CheckEmptyUtils'; import Bundle from '@ohos.bundle'; const TAG = 'NotificationRuleController'; @@ -79,7 +79,6 @@ export class RuleController { callback(sound, vibrationValues); } - /** * Get notification data of the notification * diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/actionComponent.ets b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/actionComponent.ets index 38ea970a..5af0834d 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/actionComponent.ets +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/actionComponent.ets @@ -14,7 +14,7 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import CheckEmptyUtils from '@ohos/common/src/main/ets/default/CheckEmptyUtils'; +import { CheckEmptyUtils } from '@ohos/common/src/main/ets/default/utils/CheckEmptyUtils'; import NotificationViewModel from '../../viewmodel/NotificationViewModel'; import Constants, {InputActionButtonData, NotificationLayout as Layout} from '../../common/constants'; diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/bannerNotificationItem.ets b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/bannerNotificationItem.ets index b72c1252..b340ce58 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/bannerNotificationItem.ets +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/bannerNotificationItem.ets @@ -15,8 +15,8 @@ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; -import WindowPanelManager, { WindowType } from '@ohos/common/src/main/ets/default/WindowPanelManager'; -import {notificationData} from '@ohos/common/src/main/ets/plugindatasource/common/Constants' +import WindowPanelManager, { WindowType } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager'; +import {notificationData} from '@ohos/common/src/main/ets/default/constants/PluginConstants' import Constants, {NotificationLayout as Layout} from '../../common/constants'; import NotificationViewModel from '../../viewmodel/NotificationViewModel'; import CustomItem from './customItem'; diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/generalItem.ets b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/generalItem.ets index 311d8d67..9f9f0ce0 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/generalItem.ets +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/generalItem.ets @@ -19,8 +19,7 @@ import longItem from './longItem'; import multiItem from './multiItem'; import pictureItem from './pictureItem'; import titleItem from './titleItem'; -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import CheckEmptyUtils from '@ohos/common/src/main/ets/default/CheckEmptyUtils'; +import { CheckEmptyUtils, Log } from '@ohos/common'; import NotificationViewModel from '../../viewmodel/NotificationViewModel'; import ActionComponent from './actionComponent'; diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/pictureItem.ets b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/pictureItem.ets index 8d15e1e6..9fd03278 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/pictureItem.ets +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/pictureItem.ets @@ -14,7 +14,6 @@ */ import Constants, {NotificationItemData, NotificationLayout as Layout} from '../../common/constants'; -import CheckEmptyUtils from '@ohos/common/src/main/ets/default/CheckEmptyUtils'; @Component export default struct PictureItem { diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets index 0a8fcf1c..a200e0e8 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets @@ -14,10 +14,9 @@ */ import Constants, { NotificationItemData } from '../../common/constants'; -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import CheckEmptyUtils from '@ohos/common/src/main/ets/default/CheckEmptyUtils'; -import EventManager from "@ohos/common/src/main/ets/default/event/EventManager" -import { obtainStartAbility } from "@ohos/common/src/main/ets/default/event/EventUtil" +import { CheckEmptyUtils, Log } from '@ohos/common'; +import EventManager from "@ohos/common/src/main/ets/default/utils/EventManager" +import { obtainStartAbility } from "@ohos/common/src/main/ets/default/utils/EventUtil" import Notification from '@ohos.notification'; import deviceInfo from '@ohos.deviceInfo'; diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/titleItem.ets b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/titleItem.ets index 0e4dcb8c..504111ad 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/titleItem.ets +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/titleItem.ets @@ -14,8 +14,7 @@ */ import Constants, { NotificationLayout as Layout } from '../../common/constants'; -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import CheckEmptyUtils from '@ohos/common/src/main/ets/default/CheckEmptyUtils'; +import { CheckEmptyUtils, Log } from '@ohos/common'; const TAG = 'NoticeItem-TitleItem'; @Component diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/viewmodel/NotificationViewModel.ts b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/viewmodel/NotificationViewModel.ts index 159ad01d..44263a9c 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/viewmodel/NotificationViewModel.ts +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/viewmodel/NotificationViewModel.ts @@ -13,8 +13,8 @@ * limitations under the License. */ -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import SwitchUserManager from '@ohos/common/src/main/ets/default/SwitchUserManager'; +import { Log, Trace } from '@ohos/common'; +import { SwitchUserManager } from '@ohos/common/src/main/ets/default/manager/SwitchUserManager'; import media from '@ohos.multimedia.media'; import vibrator from '@ohos.vibrator'; import wantAgent from '@ohos.wantAgent'; @@ -22,11 +22,10 @@ import Notification from '@ohos.notification'; import NotificationService from '../model/NotificationService'; import NotificationWindowManager from '../model/NotificationWindowManager'; import NotificationConfig from '../model/NotificationConfig'; -import CheckEmptyUtils from '@ohos/common/src/main/ets/default/CheckEmptyUtils'; +import {CheckEmptyUtils} from '@ohos/common/src/main/ets/default/utils/CheckEmptyUtils'; import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; -import EventManager from '@ohos/common/src/main/ets/default/event/EventManager'; -import {obtainLocalEvent} from '@ohos/common/src/main/ets/default/event/EventUtil'; -import Trace from '@ohos/common/src/main/ets/default/Trace' +import EventManager from '@ohos/common/src/main/ets/default/utils/EventManager'; +import {obtainLocalEvent} from '@ohos/common/src/main/ets/default/utils/EventUtil'; import CommonUtil from '../common/CommonUtil'; import Constants,{NotificationItemData} from '../common/constants'; diff --git a/feature/systemui/notificationmanagement/src/main/ets/pages/noDisturb.ets b/feature/systemui/notificationmanagement/src/main/ets/pages/noDisturb.ets index fafe4925..fcc1bcef 100644 --- a/feature/systemui/notificationmanagement/src/main/ets/pages/noDisturb.ets +++ b/feature/systemui/notificationmanagement/src/main/ets/pages/noDisturb.ets @@ -17,7 +17,7 @@ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import HeadComponent from '@ohos/managementcomponent/src/main/ets/com/ohos/view/component/headComponent'; import ConfigData from '../common/constants'; import deviceInfo from '@ohos.deviceInfo'; -import { concatTime } from '@ohos/common/src/main/ets/default/TimeManager'; +import { concatTime } from '@ohos/common/src/main/ets/default/manager/TimeManager'; import ItemComponent from '@ohos/managementcomponent/src/main/ets/com/ohos/view/component/itemComponent'; import {DoNotDisturbType} from '@ohos/managementcomponent/src/main/ets/com/ohos/common/constants'; import NoDisturbingModel from '@ohos/managementcomponent/src/main/ets/com/ohos/model/noDisturbingModel'; diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/DropdownPanel.ets b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/DropdownPanel.ets index 5f766461..5ce8e089 100644 --- a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/DropdownPanel.ets +++ b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/DropdownPanel.ets @@ -16,20 +16,20 @@ import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import Trace from '@ohos/common/src/main/ets/default/Trace' -import WindowPanelManager, { WindowType } from '@ohos/common/src/main/ets/default/WindowPanelManager' -import EventManager, { unsubscribe } from "@ohos/common/src/main/ets/default/event/EventManager" -import { START_ABILITY_EVENT } from "@ohos/common/src/main/ets/default/event/EventUtil" -import MultimodalInputManager from '@ohos/common/src/main/ets/default/MultimodalInputManager' +import Trace from '@ohos/common/src/main/ets/default/utils/Trace' +import WindowPanelManager, { WindowType } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager' +import EventManager, { unsubscribe } from "@ohos/common/src/main/ets/default/utils/EventManager" +import { START_ABILITY_EVENT } from "@ohos/common/src/main/ets/default/utils/EventUtil" +import MultimodalInputManager from '@ohos/common/src/main/ets/default/manager/MultimodalInputManager' import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager' -import HeightConfigUtils from '@ohos/common/src/main/ets/default/heightcofigUtils/HeightConfigUtils' +import HeightConfigUtils from '@ohos/common/src/main/ets/default/layoutconfig/HeightConfigUtils' import StatusBarVM from '@ohos/statusbarcomponent/src/main/ets/com/ohos/viewmodel/StatusBarVM' import NavigationEvent from './common/navigationEvent' import Notification from './notification' import ControlCenterComponent from './control' import StyleManager from './common/StyleManager' import dataShare from '@ohos.data.dataShare'; -import Constants from "@ohos/common/src/main/ets/default/Constants"; +import Constants from "@ohos/common/src/main/ets/default/constants/Constants"; const TAG = 'DropdownPanel' diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/SCBDropdownPanel.ets b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/SCBDropdownPanel.ets index a9c0c8aa..0bbec2de 100644 --- a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/SCBDropdownPanel.ets +++ b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/SCBDropdownPanel.ets @@ -18,7 +18,7 @@ import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abi import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; import WindowPanelManager, { WindowType, WindowInfo, SystemUi_DropdownPanel, SystemUi_BannerNotice -} from '@ohos/common/src/main/ets/default/WindowPanelManager' +} from '@ohos/common/src/main/ets/default/manager/WindowPanelManager' import { DropdownPanel } from './DropdownPanel'; import { BannerNotificationPanel } from './bannerNotification'; import screenSessionManager from '@ohos.screenSessionManager'; diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets index d48e4150..b059644d 100644 --- a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets +++ b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets @@ -14,10 +14,10 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import {notificationData} from '@ohos/common/src/main/ets/plugindatasource/common/Constants' +import {notificationData} from '@ohos/common/src/main/ets/default/constants/PluginConstants' import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; -import WindowPanelManager, { WindowType, SystemUi_BannerNotice, WindowInfo } from '@ohos/common/src/main/ets/default/WindowPanelManager'; -import EventManager, {unsubscribe} from "@ohos/common/src/main/ets/default/event/EventManager"; +import WindowPanelManager, { WindowType, SystemUi_BannerNotice, WindowInfo } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager'; +import EventManager, {unsubscribe} from "@ohos/common/src/main/ets/default/utils/EventManager"; import BannerNotification from '@ohos/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/bannerNotificationItem'; import NotificationViewModel from '@ohos/noticeitem/src/main/ets/com/ohos/noticeItem/viewmodel/NotificationViewModel'; import NotificationConstants, { ScreenLockStatus } from '@ohos/noticeitem/src/main/ets/com/ohos/noticeItem/common/constants'; diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/ControlCenterConfig.ts b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/ControlCenterConfig.ts index f5163282..9cd343cd 100644 --- a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/ControlCenterConfig.ts +++ b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/ControlCenterConfig.ts @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants'; +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants'; import { ControlCenterConfig } from '@ohos/controlcentercomponent/src/main/ets/com/ohos/common/Constants'; -import {isNfcAvailable} from '@ohos/common/src/main/ets/default/Constants'; +import {isNfcAvailable} from '@ohos/common/src/main/ets/default/constants/Constants'; const controlCenterConfig: ControlCenterConfig = { ComplexToggleLayout: [FASlotName.WIFI, FASlotName.BLUETOOTH], diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleConfiguration.ts b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleConfiguration.ts index 5295f337..a5f52817 100644 --- a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleConfiguration.ts +++ b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; import Constants from './constants'; import deviceInfo from '@ohos.deviceInfo'; diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleManager.ts b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleManager.ts index c2d96cc3..32f86b03 100644 --- a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleManager.ts +++ b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleManager.ts @@ -14,7 +14,7 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; -import CommonTemplateStyleConfiguration from '@ohos/common/src/main/ets/template/common/StyleConfiguration'; +import CommonTemplateStyleConfiguration from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration'; import ControlCenterStyleConfiguration from '@ohos/controlcentercomponent/src/main/ets/com/ohos/common/StyleConfiguration'; import BrightnessStyleConfiguration from '@ohos/brightnesscomponent/src/main/ets/default/common/StyleConfiguration'; import RingModeStyleConfiguration from '@ohos/ringmodecomponent/src/main/ets/com/ohos/common/StyleConfiguration'; diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/control.ets b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/control.ets index 4a88944f..f8eae8fb 100644 --- a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/control.ets +++ b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/control.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import {isNfcAvailable} from '@ohos/common/src/main/ets/default/Constants'; +import {isNfcAvailable} from '@ohos/common/src/main/ets/default/constants/Constants'; import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; import ControlCenterComponent from '@ohos/controlcentercomponent/src/main/ets/com/ohos/pages/ControlCenterComponent' import BatteryIcon from '@ohos/batterycomponent/src/main/ets/default/pages/batteryIcon' diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/notification.ets b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/notification.ets index ebe8de04..2cbb0516 100644 --- a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/notification.ets +++ b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/notification.ets @@ -13,11 +13,11 @@ * limitations under the License. */ -import {isNfcAvailable} from '@ohos/common/src/main/ets/default/Constants'; +import {isNfcAvailable} from '@ohos/common/src/main/ets/default/constants/Constants'; import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import EventManager, { unsubscribe } from "@ohos/common/src/main/ets/default/event/EventManager"; -import { obtainStartAbility } from "@ohos/common/src/main/ets/default/event/EventUtil"; +import EventManager, { unsubscribe } from "@ohos/common/src/main/ets/default/utils/EventManager"; +import { obtainStartAbility } from "@ohos/common/src/main/ets/default/utils/EventUtil"; import Constants from './common/constants'; import BatteryIcon from '@ohos/batterycomponent/src/main/ets/default/pages/batteryIcon'; import ClockIcon from '@ohos/clockcomponent/src/main/ets/default/pages/clockIcon'; @@ -29,9 +29,9 @@ import RingModeIcon from '@ohos/ringmodecomponent/src/main/ets/com/ohos/pages/St import NfcIcon from '@ohos/nfccomponent/src/main/ets/com/ohos/pages/StatusBarIconItemNFComponent'; import NotificationListComponent from '@ohos/noticeitem/src/main/ets/com/ohos/noticeItem/view/NotificationListComponent'; import NotificationViewModel from '@ohos/noticeitem/src/main/ets/com/ohos/noticeItem/viewmodel/NotificationViewModel'; -import ResourceUtil from '@ohos/common/src/main/ets/default/ResourceUtil'; +import ResourceUtil from '@ohos/common/src/main/ets/default/utils/ResourceUtil'; import TimeManager, { TimeEventArgs, TIME_CHANGE_EVENT -} from '@ohos/common/src/main/ets/default/TimeManager'; +} from '@ohos/common/src/main/ets/default/manager/TimeManager'; import deviceInfo from '@ohos.deviceInfo'; const TAG = 'DropdownPanel-notification'; diff --git a/feature/systemui/phone/statusbar/src/main/ets/pages/SCBStatusBar.ets b/feature/systemui/phone/statusbar/src/main/ets/pages/SCBStatusBar.ets index 1ffa688e..6d1c7227 100644 --- a/feature/systemui/phone/statusbar/src/main/ets/pages/SCBStatusBar.ets +++ b/feature/systemui/phone/statusbar/src/main/ets/pages/SCBStatusBar.ets @@ -14,7 +14,7 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { Rect as Area } from '@ohos/common/src/main/ets/default/Constants' +import { Rect as Area } from '@ohos/common/src/main/ets/default/constants/Constants' import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager' import StatusBarConfiguration from '@ohos/statusbarcomponent/src/main/ets/com/ohos/common/StatusBarConfiguration'; import screenSessionManager from '@ohos.screenSessionManager' diff --git a/feature/systemui/phone/statusbar/src/main/ets/pages/StatusBar.ets b/feature/systemui/phone/statusbar/src/main/ets/pages/StatusBar.ets index a62ee3ba..a2e220cb 100644 --- a/feature/systemui/phone/statusbar/src/main/ets/pages/StatusBar.ets +++ b/feature/systemui/phone/statusbar/src/main/ets/pages/StatusBar.ets @@ -13,11 +13,9 @@ * limitations under the License. */ -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; - -import EventManager, {unsubscribe} from "@ohos/common/src/main/ets/default/event/EventManager" -import {obtainLocalEvent} from "@ohos/common/src/main/ets/default/event/EventUtil" -import HeightConfigUtils from '@ohos/common/src/main/ets/default/heightcofigUtils/HeightConfigUtils' +import EventManager, {unsubscribe} from "@ohos/common/src/main/ets/default/utils/EventManager" +import {obtainLocalEvent} from "@ohos/common/src/main/ets/default/utils/EventUtil" +import { HeightConfigUtils } from '@ohos/common/src/main/ets/default/layoutconfig/HeightConfigUtils' import StatusBarComponent from '@ohos/statusbarcomponent/src/main/ets/com/ohos/pages/StatusBarComponent' import StatusBarVM from '@ohos/statusbarcomponent/src/main/ets/com/ohos/viewmodel/StatusBarVM' import {StatusBarData} from '@ohos/statusbarcomponent/src/main/ets/com/ohos/common/Constants' @@ -25,8 +23,8 @@ import Constants from './common/constants' import StyleManager from './common/StyleManager' import StatusbarConfig from './common/StatusbarConfig' import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager' -import Trace from '@ohos/common/src/main/ets/default/Trace' -import { WindowType, WINDOW_SHOW_HIDE_EVENT } from '@ohos/common/src/main/ets/default/WindowPanelManager' +import { Trace, Log } from '@ohos/common'; +import { WindowType, WINDOW_SHOW_HIDE_EVENT } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager' const TAG = "StatusBar"; const SLIDING_STATUS_BAR_DISTANCE = 18 diff --git a/feature/systemui/phone/statusbar/src/main/ets/pages/common/StatusbarConfig.ts b/feature/systemui/phone/statusbar/src/main/ets/pages/common/StatusbarConfig.ts index 523dcb71..cc81c063 100644 --- a/feature/systemui/phone/statusbar/src/main/ets/pages/common/StatusbarConfig.ts +++ b/feature/systemui/phone/statusbar/src/main/ets/pages/common/StatusbarConfig.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants'; +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants'; import { StatusBarConfig } from '@ohos/statusbarcomponent/src/main/ets/com/ohos/common/Constants'; diff --git a/feature/systemui/phone/statusbar/src/main/ets/pages/common/StyleConfiguration.ts b/feature/systemui/phone/statusbar/src/main/ets/pages/common/StyleConfiguration.ts index ec014638..7e7ef2cc 100644 --- a/feature/systemui/phone/statusbar/src/main/ets/pages/common/StyleConfiguration.ts +++ b/feature/systemui/phone/statusbar/src/main/ets/pages/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; const TAG = 'StatusBar-StyleConfiguration'; diff --git a/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts b/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts index 56837f3b..3b844383 100644 --- a/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts +++ b/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; const TAG = 'capsule-StyleConfiguration'; diff --git a/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/model/RingModeService.ts b/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/model/RingModeService.ts index afc24e0c..6cd3a25e 100644 --- a/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/model/RingModeService.ts +++ b/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/model/RingModeService.ts @@ -16,8 +16,8 @@ import audio from '@ohos.multimedia.audio'; import { BusinessError } from 'basic'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; -import { getAudioManager } from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; +import { getAudioManager } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; import { AudioRingMode } from '../common/Constants'; const TAG = 'RingModeModel'; diff --git a/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleRingModeComponent.ets b/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleRingModeComponent.ets index 95c7d073..22e1c13f 100644 --- a/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleRingModeComponent.ets +++ b/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/pages/ControlCenterSimpleToggleRingModeComponent.ets @@ -14,11 +14,11 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log' -import EventManager from "@ohos/common/src/main/ets/default/event/EventManager" -import { obtainStartAbility } from "@ohos/common/src/main/ets/default/event/EventUtil" +import EventManager from "@ohos/common/src/main/ets/default/utils/EventManager" +import { obtainStartAbility } from "@ohos/common/src/main/ets/default/utils/EventUtil" import { AudioRingMode } from '../common/Constants' import ViewModel from '../viewmodel/RingModeVM' -import SimpleToggleBase from '@ohos/common/src/main/ets/template/SimpleToggleBase' +import SimpleToggleBase from '@ohos/common/src/main/ets/default/base/SimpleToggleBase' import StyleConfiguration, { ControlCenterRingModeComponentStyle } from '../common/StyleConfiguration' const TAG = 'ringmode-ControlCenterSimpleToggleRingModeComponent' diff --git a/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/pages/StatusBarIconItemRingModeComponent.ets b/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/pages/StatusBarIconItemRingModeComponent.ets index 3b18da86..787dbec0 100644 --- a/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/pages/StatusBarIconItemRingModeComponent.ets +++ b/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/pages/StatusBarIconItemRingModeComponent.ets @@ -14,9 +14,9 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log' -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager' +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager' import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration' +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration' import StyleConfiguration, { StatusRingModeComponentStyle } from '../common/StyleConfiguration' import Constants, { AudioRingMode } from '../common/Constants' import ViewModel from '../viewmodel/RingModeVM' diff --git a/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/viewmodel/RingModeVM.ts b/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/viewmodel/RingModeVM.ts index c4c46f6a..f2dcf1b2 100644 --- a/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/viewmodel/RingModeVM.ts +++ b/feature/systemui/ringmodecomponent/src/main/ets/com/ohos/viewmodel/RingModeVM.ts @@ -14,10 +14,10 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants'; +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants'; import { TintContentInfo, getOrCreateTintContentInfo -} from '@ohos/common/src/main/ets/default/TintStateManager'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +} from '@ohos/common/src/main/ets/default/manager/TintStateManager'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; import { AudioRingMode } from '../common/Constants'; import RingModeService from '../model/RingModeService'; diff --git a/feature/systemui/screenlock/src/main/ets/com/ohos/model/accountsModel.ts b/feature/systemui/screenlock/src/main/ets/com/ohos/model/accountsModel.ts index 89d059ff..a4367355 100644 --- a/feature/systemui/screenlock/src/main/ets/com/ohos/model/accountsModel.ts +++ b/feature/systemui/screenlock/src/main/ets/com/ohos/model/accountsModel.ts @@ -18,12 +18,11 @@ import osAccount from '@ohos.account.osAccount' import commonEvent from '@ohos.commonEvent'; import util from '@ohos.util'; import {Callback} from 'basic'; -import Trace from '@ohos/common/src/main/ets/default/Trace'; -import {SysFaultLogger, FaultID} from '@ohos/common/src/main/ets/default/SysFaultLogger'; -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; +import { Trace, Log } from '@ohos/common'; +import {SysFaultLogger, FaultID} from '@ohos/common/src/main/ets/default/utils/SysFaultLogger'; import { CommonEventManager, getCommonEventManager } from "@ohos/common/src/main/ets/default/commonEvent/CommonEventManager"; -import EventManager from "@ohos/common/src/main/ets/default/event/EventManager"; -import { obtainLocalEvent } from "@ohos/common/src/main/ets/default/event/EventUtil"; +import EventManager from "@ohos/common/src/main/ets/default/utils/EventManager"; +import { obtainLocalEvent } from "@ohos/common/src/main/ets/default/utils/EventUtil"; import {UserData} from '../data/userData'; const TAG = "ScreenLock-AccountsModel" diff --git a/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts b/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts index 820185a0..7c1bb7da 100644 --- a/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts +++ b/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Trace from '@ohos/common/src/main/ets/default/Trace' -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import {SysFaultLogger, FaultID} from '@ohos/common/src/main/ets/default/SysFaultLogger' +import { Trace, Log } from '@ohos/common'; +import {SysFaultLogger, FaultID} from '@ohos/common/src/main/ets/default/utils/SysFaultLogger' import ScreenLockMar from '@ohos.screenlock'; -import WindowPanelManager, { WindowType } from '@ohos/common/src/main/ets/default/WindowPanelManager' +import WindowPanelManager, { WindowType } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager' import Constants from '../common/constants' import { Callback } from 'basic'; diff --git a/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenLockService.ts b/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenLockService.ts index 6e8bbb2d..84a94a19 100644 --- a/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenLockService.ts +++ b/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenLockService.ts @@ -12,13 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import Trace from '@ohos/common/src/main/ets/default/Trace' -import {writeFaultLog, FaultID} from '@ohos/common/src/main/ets/default/SysFaultLogger' +import { Trace, Log } from '@ohos/common'; +import {writeFaultLog, FaultID} from '@ohos/common/src/main/ets/default/utils/SysFaultLogger' import ScreenLockModel from './screenLockModel'; import AccountModel, {AuthType, AuthSubType, AuthTurstLevel} from './accountsModel' -import {ScreenLockStatus} from '@ohos/common/src/main/ets/default/ScreenLockCommon'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper' +import {ScreenLockStatus} from '@ohos/common/src/main/ets/default/utils/ScreenLockCommon'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper' import Router from '@system.router'; import commonEvent from '@ohos.commonEvent'; import hiDebug from '@ohos.hidebug'; diff --git a/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenlockStyle.ts b/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenlockStyle.ts index 911c8c78..2842c860 100644 --- a/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenlockStyle.ts +++ b/feature/systemui/screenlock/src/main/ets/com/ohos/model/screenlockStyle.ts @@ -13,7 +13,7 @@ * limitations under the License. */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import {ReadConfigFile} from '@ohos/common/src/main/ets/default/ScreenLockCommon' +import {ReadConfigFile} from '@ohos/common/src/main/ets/default/utils/ScreenLockCommon' const SCREENLOCK_MODE_FILE_NAME = "screenlock.json"; const TAG = 'ScreenLock-ScreenlockStyle'; diff --git a/feature/systemui/screenlock/src/main/ets/com/ohos/view/component/accounts.ets b/feature/systemui/screenlock/src/main/ets/com/ohos/view/component/accounts.ets index 135e8116..5a028a99 100644 --- a/feature/systemui/screenlock/src/main/ets/com/ohos/view/component/accounts.ets +++ b/feature/systemui/screenlock/src/main/ets/com/ohos/view/component/accounts.ets @@ -18,7 +18,7 @@ import ViewModel from '../../vm/accountsViewModel'; import Constants from '../../common/constants'; import {UserData} from '../../data/userData'; import { ACCOUNTS_REFRESH_EVENT } from '../../model/accountsModel' -import EventManager, { unsubscribe } from '@ohos/common/src/main/ets/default/event/EventManager'; +import EventManager, { unsubscribe } from '@ohos/common/src/main/ets/default/utils/EventManager'; const TAG = 'ScreenLock-Accounts' diff --git a/feature/systemui/screenlock/src/main/ets/com/ohos/view/component/lockIcon.ets b/feature/systemui/screenlock/src/main/ets/com/ohos/view/component/lockIcon.ets index e9b11865..0c52908b 100644 --- a/feature/systemui/screenlock/src/main/ets/com/ohos/view/component/lockIcon.ets +++ b/feature/systemui/screenlock/src/main/ets/com/ohos/view/component/lockIcon.ets @@ -14,7 +14,7 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import {ScreenLockStatus} from '@ohos/common/src/main/ets/default/ScreenLockCommon' +import {ScreenLockStatus} from '@ohos/common/src/main/ets/default/utils/ScreenLockCommon' import ViewModel from '../../vm/lockIconViewModel' import Constants from '../../common/constants' diff --git a/feature/systemui/screenlock/src/main/ets/com/ohos/vm/StatusBarVM.ts b/feature/systemui/screenlock/src/main/ets/com/ohos/vm/StatusBarVM.ts index 54db2a92..2fd6653c 100644 --- a/feature/systemui/screenlock/src/main/ets/com/ohos/vm/StatusBarVM.ts +++ b/feature/systemui/screenlock/src/main/ets/com/ohos/vm/StatusBarVM.ts @@ -14,7 +14,7 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import WindowManager, { WindowType } from '@ohos/common/src/main/ets/default/WindowPanelManager'; +import WindowManager, { WindowType } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager'; import Constants, {StatusBarGroupComponentData} from '../common/constants'; const TAG = 'StatusBarVM'; diff --git a/feature/systemui/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts b/feature/systemui/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts index 9356f4da..1a49c481 100644 --- a/feature/systemui/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts +++ b/feature/systemui/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts @@ -13,8 +13,7 @@ * limitations under the License. */ -import Trace from '@ohos/common/src/main/ets/default/Trace' -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; +import { Trace, Log } from '@ohos/common'; import Constants from '../common/constants' import BaseViewModel, {service, AuthType, AuthSubType} from './baseViewModel' import {Callback} from 'basic'; diff --git a/feature/systemui/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts b/feature/systemui/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts index 332c06af..3bf1aa3e 100644 --- a/feature/systemui/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts +++ b/feature/systemui/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts @@ -13,8 +13,7 @@ * limitations under the License. */ -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import Trace from '@ohos/common/src/main/ets/default/Trace' +import { Trace, Log } from '@ohos/common'; import Constants from '../common/constants' import BaseViewModel, {service, AuthType, AuthSubType} from './baseViewModel' import {Callback} from 'basic'; diff --git a/feature/systemui/screenlock/src/main/ets/com/ohos/vm/lockIconViewModel.ts b/feature/systemui/screenlock/src/main/ets/com/ohos/vm/lockIconViewModel.ts index 751334e6..c12912da 100644 --- a/feature/systemui/screenlock/src/main/ets/com/ohos/vm/lockIconViewModel.ts +++ b/feature/systemui/screenlock/src/main/ets/com/ohos/vm/lockIconViewModel.ts @@ -14,7 +14,7 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import {ScreenLockStatus} from '@ohos/common/src/main/ets/default/ScreenLockCommon' +import {ScreenLockStatus} from '@ohos/common/src/main/ets/default/utils/ScreenLockCommon' import screenLockService from '../model/screenLockService' const TAG = 'ScreenLock-LockIconViewModel' diff --git a/feature/systemui/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts b/feature/systemui/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts index 0b1d6f84..bb48803b 100644 --- a/feature/systemui/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts +++ b/feature/systemui/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts @@ -13,8 +13,7 @@ * limitations under the License. */ -import Trace from '@ohos/common/src/main/ets/default/Trace' -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; +import { Trace, Log } from '@ohos/common'; import BaseViewModel, {service, AuthType, AuthSubType} from './baseViewModel' import {Callback} from 'basic'; diff --git a/feature/systemui/signalcomponent/src/main/ets/default/common/StyleConfiguration.ts b/feature/systemui/signalcomponent/src/main/ets/default/common/StyleConfiguration.ts index 5c7da693..2d979c33 100644 --- a/feature/systemui/signalcomponent/src/main/ets/default/common/StyleConfiguration.ts +++ b/feature/systemui/signalcomponent/src/main/ets/default/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; const TAG = 'signal-StyleConfiguration'; diff --git a/feature/systemui/signalcomponent/src/main/ets/default/pages/signalIcon.ets b/feature/systemui/signalcomponent/src/main/ets/default/pages/signalIcon.ets index c122aad4..7f978cf1 100644 --- a/feature/systemui/signalcomponent/src/main/ets/default/pages/signalIcon.ets +++ b/feature/systemui/signalcomponent/src/main/ets/default/pages/signalIcon.ets @@ -16,9 +16,9 @@ import Constants from '../common/constants'; import mSignalModel from '../signalModel'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager' +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager' import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration' +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration' import StyleConfiguration, { SignalComponentStyle } from '../common/StyleConfiguration' import ViewModel from '../viewmodel/SignalVM' diff --git a/feature/systemui/signalcomponent/src/main/ets/default/viewmodel/SignalVM.ts b/feature/systemui/signalcomponent/src/main/ets/default/viewmodel/SignalVM.ts index 3b735469..9de12dec 100644 --- a/feature/systemui/signalcomponent/src/main/ets/default/viewmodel/SignalVM.ts +++ b/feature/systemui/signalcomponent/src/main/ets/default/viewmodel/SignalVM.ts @@ -14,10 +14,10 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants'; +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants'; import { TintContentInfo, getOrCreateTintContentInfo -} from '@ohos/common/src/main/ets/default/TintStateManager'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +} from '@ohos/common/src/main/ets/default/manager/TintStateManager'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; const TAG = 'SignalVM'; diff --git a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/Constants.ts b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/Constants.ts index 2bfa34be..8700afe2 100644 --- a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/Constants.ts +++ b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/Constants.ts @@ -13,9 +13,9 @@ * limitations under the License. */ -import { Event } from '@ohos/common/src/main/ets/default/event/EventUtil'; +import { Event } from '@ohos/common/src/main/ets/default/utils/EventUtil'; import { ItemComponentData, ActionData, FilterData -} from '@ohos/common/src/main/ets/plugindatasource/common/Constants'; +} from '@ohos/common/src/main/ets/default/constants/PluginConstants'; export default class Constants { static readonly EMPTY_AREA_POSITION_LEFT = 'left'; diff --git a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/StatusBarConfiguration.ts b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/StatusBarConfiguration.ts index 3a844ce5..171b9a09 100644 --- a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/StatusBarConfiguration.ts +++ b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/StatusBarConfiguration.ts @@ -15,8 +15,8 @@ import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import ResourceUtil from '@ohos/common/src/main/ets/default/ResourceUtil' -import CommonStyleConfiguration from '@ohos/common/src/main/ets/default/StyleConfiguration' +import ResourceUtil from '@ohos/common/src/main/ets/default/utils/ResourceUtil' +import CommonStyleConfiguration from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration' import screenSessionManager from '@ohos.screenSessionManager' const TAG = 'StatusBarConfiguration'; diff --git a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts index c6c44747..0a852b0f 100644 --- a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts +++ b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; import Constants from './Constants'; const TAG = 'statusBar-StyleConfiguration'; diff --git a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts index f479b338..bac852cd 100644 --- a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts +++ b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts @@ -14,15 +14,15 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; -import SwitchUserManager, { UserInfo } from '@ohos/common/src/main/ets/default/SwitchUserManager'; +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; +import {SwitchUserManager, UserInfo } from '@ohos/common/src/main/ets/default/manager/SwitchUserManager'; import { ItemComponentData, PluginComponentData, FilterData -} from '@ohos/common/src/main/ets/plugindatasource/common/Constants'; +} from '@ohos/common/src/main/ets/default/constants/PluginConstants'; import PluginDataSourceAdapter from '@ohos/common/src/main/ets/plugindatasource/PluginDataSourceAdapter'; import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; import Constants, { StatusBarData, StatusBarComponentData, LayoutGroup, StatusBarConfig } from '../common/Constants'; -import { parseEventString } from '@ohos/common/src/main/ets/default/event/EventUtil'; +import { parseEventString } from '@ohos/common/src/main/ets/default/utils/EventUtil'; export interface StatusBarListener { setStatusBarLayout(layout: string[][]): void; diff --git a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/IconItemComponent.ets b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/IconItemComponent.ets index cade812c..c43ad6c5 100644 --- a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/IconItemComponent.ets +++ b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/IconItemComponent.ets @@ -13,14 +13,13 @@ * limitations under the License. */ -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import EventManager, { unsubscribe } from '@ohos/common/src/main/ets/default/event/EventManager' -import CheckEmptyUtils from '@ohos/common/src/main/ets/default/CheckEmptyUtils' -import { WINDOW_SHOW_HIDE_EVENT } from '@ohos/common/src/main/ets/default/WindowPanelManager' -import { PluginType,itemData } from "@ohos/common/src/main/ets/plugindatasource/common/Constants" +import EventManager, { unsubscribe } from '@ohos/common/src/main/ets/default/utils/EventManager' +import { CheckEmptyUtils, Log } from '@ohos/common'; +import { WINDOW_SHOW_HIDE_EVENT } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager' +import { PluginType,itemData } from "@ohos/common/src/main/ets/default/constants/PluginConstants" import ViewModel from '../viewmodel/StatusBarVM' import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration' +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration' import StyleConfiguration, { IconItemComponentStyle } from '../common/StyleConfiguration' import MetaIconItemComponent from './MetaIconItemComponent' import PluginIconItemComponent from './PluginIconItemComponent' diff --git a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/MetaIconItemComponent.ets b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/MetaIconItemComponent.ets index 41159396..71ac7733 100644 --- a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/MetaIconItemComponent.ets +++ b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/MetaIconItemComponent.ets @@ -13,14 +13,13 @@ * limitations under the License. */ -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager' -import CheckEmptyUtils from '@ohos/common/src/main/ets/default/CheckEmptyUtils' +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager' +import { CheckEmptyUtils, Log } from '@ohos/common'; import ViewModel from '../viewmodel/StatusBarVM' import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration' +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration' import StyleConfiguration, { IconItemComponentStyle } from '../common/StyleConfiguration' -import { itemData } from "@ohos/common/src/main/ets/plugindatasource/common/Constants" +import { itemData } from "@ohos/common/src/main/ets/default/constants/PluginConstants" const TAG = 'MetaIconItemComponent' diff --git a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/PluginIconItemComponent.ets b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/PluginIconItemComponent.ets index eb8b0d06..be5c81f9 100644 --- a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/PluginIconItemComponent.ets +++ b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/PluginIconItemComponent.ets @@ -14,10 +14,10 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager' -import { PluginComponentData } from "@ohos/common/src/main/ets/plugindatasource/common/Constants" +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager' +import { PluginComponentData } from "@ohos/common/src/main/ets/default/constants/PluginConstants" import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration' +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration' import StyleConfiguration, { PluginIconItemComponentStyle } from '../common/StyleConfiguration' import ViewModel from '../viewmodel/StatusBarVM' diff --git a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/StatusBarComponent.ets b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/StatusBarComponent.ets index 759f3b7d..cd44c58f 100644 --- a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/StatusBarComponent.ets +++ b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/pages/StatusBarComponent.ets @@ -13,13 +13,13 @@ * limitations under the License. */ -import {isNfcAvailable} from '@ohos/common/src/main/ets/default/Constants'; +import {isNfcAvailable} from '@ohos/common/src/main/ets/default/constants/Constants'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import { StatusBarData, StatusBarBackgroundData, StatusBarConfig } from '../common/Constants' -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants' -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager' +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants' +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager' import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration' +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration' import StyleConfiguration, { StatusBarNotificationIconStyle, VerticalStatusBarItemLoadComponentStyle } from '../common/StyleConfiguration' import ViewModel from '../viewmodel/StatusBarVM' diff --git a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/viewmodel/StatusBarVM.ts b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/viewmodel/StatusBarVM.ts index 2a6b2ac9..6fe3070d 100644 --- a/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/viewmodel/StatusBarVM.ts +++ b/feature/systemui/statusbarcomponent/src/main/ets/com/ohos/viewmodel/StatusBarVM.ts @@ -14,17 +14,17 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import EventManager from '@ohos/common/src/main/ets/default/event/EventManager'; -import { obtainLocalEvent } from '@ohos/common/src/main/ets/default/event/EventUtil'; +import EventManager from '@ohos/common/src/main/ets/default/utils/EventManager'; +import { obtainLocalEvent } from '@ohos/common/src/main/ets/default/utils/EventUtil'; import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; -import WindowPanelManager, { WindowType } from '@ohos/common/src/main/ets/default/WindowPanelManager'; -import TintStateManager, { TintState, TintContentInfo, getOrCreateTintContentInfo -} from '@ohos/common/src/main/ets/default/TintStateManager'; -import { FASlotName, Rect } from '@ohos/common/src/main/ets/default/Constants'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; +import WindowPanelManager, { WindowType } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager'; +import { TintStateManager,TintState, TintContentInfo, getOrCreateTintContentInfo +} from '@ohos/common/src/main/ets/default/manager/TintStateManager'; +import { FASlotName, Rect } from '@ohos/common/src/main/ets/default/constants/Constants'; import { PluginType, PluginComponentData -} from '@ohos/common/src/main/ets/plugindatasource/common/Constants'; -import StyleConfigurationCommon from '@ohos/common/src/main/ets/default/StyleConfiguration'; +} from '@ohos/common/src/main/ets/default/constants/PluginConstants'; +import StyleConfigurationCommon from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration'; import { StatusBarData, StatusBarBackgroundData, StatusBarComponentGroupContentData, StatusBarComponentData, StatusBarConfig } from '../common/Constants'; import StatusBarService from '../model/StatusBarService'; diff --git a/feature/systemui/volumepanel/src/main/ets/common/StyleConfiguration.ts b/feature/systemui/volumepanel/src/main/ets/common/StyleConfiguration.ts index 66c3c1a6..acf542cb 100644 --- a/feature/systemui/volumepanel/src/main/ets/common/StyleConfiguration.ts +++ b/feature/systemui/volumepanel/src/main/ets/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; const TAG = 'VolumePanel-StyleConfiguration'; diff --git a/feature/systemui/volumepanel/src/main/ets/pages/SCBVolumePanel.ets b/feature/systemui/volumepanel/src/main/ets/pages/SCBVolumePanel.ets index 2b7ac91c..c01c63ba 100644 --- a/feature/systemui/volumepanel/src/main/ets/pages/SCBVolumePanel.ets +++ b/feature/systemui/volumepanel/src/main/ets/pages/SCBVolumePanel.ets @@ -18,7 +18,7 @@ import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abi import StyleManager from '../common/StyleManager' import screenSessionManager from '@ohos.screenSessionManager' import VolumeWindowController from '@ohos/volumepanelcomponent/src/main/ets/com/ohos/common/VolumeWindowController' -import { Rect as Area } from '@ohos/common/src/main/ets/default/Constants' +import { Rect as Area } from '@ohos/common/src/main/ets/default/constants/Constants' const TAG = 'SCBVolumePanel' diff --git a/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts b/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts index 9692fdc1..5d9005b4 100644 --- a/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts +++ b/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; import Constants from './Constants'; const TAG = 'volumepanel-StyleConfiguration'; diff --git a/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/common/VolumeWindowController.ts b/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/common/VolumeWindowController.ts index 671d47cc..20577261 100644 --- a/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/common/VolumeWindowController.ts +++ b/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/common/VolumeWindowController.ts @@ -14,8 +14,8 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import getSingleInstance from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; -import Trace from '@ohos/common/src/main/ets/default/Trace' +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; +import {Trace} from '@ohos/common/src/main/ets/default/utils/Trace' import VolumePanelService from '../model/VolumePanelService'; import { VolumeInfo } from '../common/Constants'; @@ -30,7 +30,7 @@ export default class VolumeWindowController { mIsWindowShown: boolean; static getInstance(): VolumeWindowController{ - return getSingleInstance(VolumeWindowController, SINGLE_STANCE_KEY); + return createOrGet(VolumeWindowController, SINGLE_STANCE_KEY); } constructor() { diff --git a/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/model/VolumePanelService.ts b/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/model/VolumePanelService.ts index fc326ea3..9f39d628 100644 --- a/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/model/VolumePanelService.ts +++ b/feature/systemui/volumepanelcomponent/src/main/ets/com/ohos/model/VolumePanelService.ts @@ -16,8 +16,8 @@ import audio from '@ohos.multimedia.audio'; import { BusinessError } from 'basic'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import getSingleInstance, { getAudioManager -} from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +import {createOrGet, getAudioManager +} from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; import { AudioVolumeType, VolumeInfo } from '../common/Constants'; const TAG = 'VolumePanelModel'; @@ -316,6 +316,6 @@ export class VolumePanelService { } } -let volumePanelService = getSingleInstance(VolumePanelService, TAG); +let volumePanelService = createOrGet(VolumePanelService, TAG); export default volumePanelService; \ No newline at end of file diff --git a/feature/systemui/wificomponent/src/main/ets/default/common/StyleConfiguration.ts b/feature/systemui/wificomponent/src/main/ets/default/common/StyleConfiguration.ts index 55440d15..3039c3b2 100644 --- a/feature/systemui/wificomponent/src/main/ets/default/common/StyleConfiguration.ts +++ b/feature/systemui/wificomponent/src/main/ets/default/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; const TAG = 'wifi-StyleConfiguration'; diff --git a/feature/systemui/wificomponent/src/main/ets/default/pages/wifiComponent.ets b/feature/systemui/wificomponent/src/main/ets/default/pages/wifiComponent.ets index 7bb0d04f..0533a871 100644 --- a/feature/systemui/wificomponent/src/main/ets/default/pages/wifiComponent.ets +++ b/feature/systemui/wificomponent/src/main/ets/default/pages/wifiComponent.ets @@ -15,9 +15,9 @@ import mWifiManger from '../wifiModel' import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import EventManager from "@ohos/common/src/main/ets/default/event/EventManager" -import {obtainStartAbility} from "@ohos/common/src/main/ets/default/event/EventUtil" -import iconTitleBase from '@ohos/common/src/main/ets/template/iconTitleBase' +import EventManager from "@ohos/common/src/main/ets/default/utils/EventManager" +import {obtainStartAbility} from "@ohos/common/src/main/ets/default/utils/EventUtil" +import iconTitleBase from '@ohos/common/src/main/ets/default/base/iconTitleBase' import Constants from '../common/constants' const TAG = 'Control-wifiComponent' diff --git a/feature/systemui/wificomponent/src/main/ets/default/pages/wifiIcon.ets b/feature/systemui/wificomponent/src/main/ets/default/pages/wifiIcon.ets index 1a65054f..526bb827 100644 --- a/feature/systemui/wificomponent/src/main/ets/default/pages/wifiIcon.ets +++ b/feature/systemui/wificomponent/src/main/ets/default/pages/wifiIcon.ets @@ -16,9 +16,9 @@ import Constants from '../common/constants' import mWifiModel from '../wifiModel' import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { TintContentInfo } from '@ohos/common/src/main/ets/default/TintStateManager' +import { TintContentInfo } from '@ohos/common/src/main/ets/default/manager/TintStateManager' import StyleConfigurationCommon, { CommonStyle -} from '@ohos/common/src/main/ets/default/StyleConfiguration' +} from '@ohos/common/src/main/ets/default/layoutconfig/StyleConfiguration' import StyleConfiguration, { StartsBarWifiComponentStyle } from '../common/StyleConfiguration' import ViewModel from '../viewmodel/WifiVM' diff --git a/feature/systemui/wificomponent/src/main/ets/default/viewmodel/WifiVM.ts b/feature/systemui/wificomponent/src/main/ets/default/viewmodel/WifiVM.ts index 8947787a..8c61a1a2 100644 --- a/feature/systemui/wificomponent/src/main/ets/default/viewmodel/WifiVM.ts +++ b/feature/systemui/wificomponent/src/main/ets/default/viewmodel/WifiVM.ts @@ -14,10 +14,10 @@ */ import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import { FASlotName } from '@ohos/common/src/main/ets/default/Constants'; +import { FASlotName } from '@ohos/common/src/main/ets/default/constants/Constants'; import { TintContentInfo, getOrCreateTintContentInfo -} from '@ohos/common/src/main/ets/default/TintStateManager'; -import createOrGet from '@ohos/common/src/main/ets/default/SingleInstanceHelper'; +} from '@ohos/common/src/main/ets/default/manager/TintStateManager'; +import { createOrGet } from '@ohos/common/src/main/ets/default/utils/SingleInstanceHelper'; const TAG = 'WifiVM'; diff --git a/product/phone/src/main/ets/MainAbility/MainAbility.ts b/product/phone/src/main/ets/MainAbility/MainAbility.ts index 19236e0c..4c055dd8 100644 --- a/product/phone/src/main/ets/MainAbility/MainAbility.ts +++ b/product/phone/src/main/ets/MainAbility/MainAbility.ts @@ -27,9 +27,12 @@ import StyleConstants from '../common/constants/StyleConstants'; import { navigationBarCommonEventManager } from '@ohos/common'; import PageDesktopViewModel from '../../../../../../feature/pagedesktop/src/main/ets/default/viewmodel/PageDesktopViewModel'; import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; -import initSystemUi from '../../../../../../common/src/main/ets/default/InitSystemUi'; import SessionManagerService from '@ohos.session_manager_service'; import rpc from '@ohos.rpc'; +import EventManager from '@ohos/common/src/main/ets/default/utils/EventManager'; +import ScreenLockManager from '@ohos/common/src/main/ets/default/manager/ScreenLockManager'; +import ServiceExtensionContext from 'application/ServiceExtensionContext'; +import TimeManager from '@ohos/common/src/main/ets/default/manager/TimeManager'; const TAG = 'LauncherMainAbility'; @@ -38,7 +41,7 @@ export default class MainAbility extends ServiceExtensionAbility { Log.showInfo(TAG,'onCreate start'); this.context.area = 0; this.initLauncher(); - initSystemUi(this.context); + this.initSystemUi(this.context); AbilityManager.setContext(AbilityManager.ABILITY_NAME_ENTRY, this.context); } @@ -121,4 +124,13 @@ export default class MainAbility extends ServiceExtensionAbility { AppStorage.SetOrCreate('openFolderPageIndex', StyleConstants.DEFAULT_NUMBER_0); AppStorage.SetOrCreate('openFolderStatus', StyleConstants.DEFAULT_NUMBER_0); } + + private initSystemUi(context: ServiceExtensionContext): void { + EventManager.setContext(context); + ScreenLockManager.init().then(() => { + }).catch(err => { + }); + TimeManager.init(context); + Log.showDebug(TAG, `init done, ctx: ${context}`); + } } diff --git a/product/phone/src/main/ets/WindowScene/HWSystemUi.ets b/product/phone/src/main/ets/WindowScene/HWSystemUi.ets index 2644e95b..72e53fda 100644 --- a/product/phone/src/main/ets/WindowScene/HWSystemUi.ets +++ b/product/phone/src/main/ets/WindowScene/HWSystemUi.ets @@ -15,7 +15,7 @@ import AbilityManager from '../../../../../../common/src/main/ets/default/abilit */ import { Log } from '@ohos/common'; -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager' +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager' import screenSessionManager from '@ohos.screenSessionManager'; import { SCBStatusBar } from '@ohos/phone_statusbar/src/main/ets/pages/SCBStatusBar'; import { SCBDropdownPanel } from '@ohos/phone_dropdownpanel/src/main/ets/pages/SCBDropdownPanel'; diff --git a/product/phone/src/main/ets/screenlock/common/StyleConfiguration.ts b/product/phone/src/main/ets/screenlock/common/StyleConfiguration.ts index 1996ef2a..27ff2a2b 100644 --- a/product/phone/src/main/ets/screenlock/common/StyleConfiguration.ts +++ b/product/phone/src/main/ets/screenlock/common/StyleConfiguration.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; const TAG = 'Lock_StatusBar-StyleConfiguration'; diff --git a/product/phone/src/main/ets/screenlock/pages/SCBScreenLock.ets b/product/phone/src/main/ets/screenlock/pages/SCBScreenLock.ets index 935137f0..94cf0f19 100644 --- a/product/phone/src/main/ets/screenlock/pages/SCBScreenLock.ets +++ b/product/phone/src/main/ets/screenlock/pages/SCBScreenLock.ets @@ -13,9 +13,8 @@ * limitations under the License. */ -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import Trace from '@ohos/common/src/main/ets/default/Trace' -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager' +import { Trace, Log } from '@ohos/common'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager' import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager' import {LockStyleMode} from '@ohos/screenlock/src/main/ets/com/ohos/model/screenlockStyle' import ViewModel from '../vm/indexViewModel' @@ -25,8 +24,8 @@ import JournalScreenLock from './journalscreenlock' import Constants from '../common/constants' import StyleManager from '../common/StyleManager' import Router from '@system.router'; -import sTimeManager from '@ohos/common/src/main/ets/default/TimeManager' -import WindowPanelManager, { WindowType, WindowInfo, SystemUi_ScreenLock } from '@ohos/common/src/main/ets/default/WindowPanelManager'; +import sTimeManager from '@ohos/common/src/main/ets/default/manager/TimeManager' +import WindowPanelManager, { WindowType, WindowInfo, SystemUi_ScreenLock } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager'; import screenSessionManager from '@ohos.screenSessionManager'; const TAG = 'ScreenLock-Entry'; diff --git a/product/phone/src/main/ets/screenlock/pages/customPassword.ets b/product/phone/src/main/ets/screenlock/pages/customPassword.ets index 1adbec5b..9f8de758 100644 --- a/product/phone/src/main/ets/screenlock/pages/customPassword.ets +++ b/product/phone/src/main/ets/screenlock/pages/customPassword.ets @@ -13,9 +13,8 @@ * limitations under the License. */ -import Trace from '@ohos/common/src/main/ets/default/Trace' -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager' +import { Trace, Log } from '@ohos/common'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager' import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager' import StatusBar from '@ohos/screenlock/src/main/ets/com/ohos/view/component/statusBar' import CustomPSD from '@ohos/screenlock/src/main/ets/com/ohos/view/component/customPSD' diff --git a/product/phone/src/main/ets/screenlock/pages/digitalPassword.ets b/product/phone/src/main/ets/screenlock/pages/digitalPassword.ets index 5db8ccf5..88809cf0 100644 --- a/product/phone/src/main/ets/screenlock/pages/digitalPassword.ets +++ b/product/phone/src/main/ets/screenlock/pages/digitalPassword.ets @@ -13,9 +13,8 @@ * limitations under the License. */ -import Trace from '@ohos/common/src/main/ets/default/Trace' -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager' +import { Trace, Log } from '@ohos/common'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager' import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager' import StatusBar from '@ohos/screenlock/src/main/ets/com/ohos/view/component/statusBar' import DigitalPSD from '@ohos/screenlock/src/main/ets/com/ohos/view/component/digitalPSD' diff --git a/product/phone/src/main/ets/screenlock/pages/mixedPassword.ets b/product/phone/src/main/ets/screenlock/pages/mixedPassword.ets index 547d03fa..6a96c0bf 100644 --- a/product/phone/src/main/ets/screenlock/pages/mixedPassword.ets +++ b/product/phone/src/main/ets/screenlock/pages/mixedPassword.ets @@ -13,9 +13,8 @@ * limitations under the License. */ -import Trace from '@ohos/common/src/main/ets/default/Trace' -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import CommonStyleManager from '@ohos/common/src/main/ets/default/CommonStyleManager' +import { Trace, Log } from '@ohos/common'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager' import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager' import StatusBar from '@ohos/screenlock/src/main/ets/com/ohos/view/component/statusBar' import MixedPSD from '@ohos/screenlock/src/main/ets/com/ohos/view/component/mixedPSD' diff --git a/product/phone/src/main/ets/workers/PluginDataSourceWorker.js b/product/phone/src/main/ets/workers/PluginDataSourceWorker.js index be1c95fd..0683f6b0 100644 --- a/product/phone/src/main/ets/workers/PluginDataSourceWorker.js +++ b/product/phone/src/main/ets/workers/PluginDataSourceWorker.js @@ -16,7 +16,7 @@ import worker from '@ohos.worker'; import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; import PluginDataSourceManager from '@ohos/common/src/main/ets/plugindatasource/PluginDataSourceManager'; -import Constants, { obtainMsg } from '@ohos/common/src/main/ets/plugindatasource/common/Constants'; +import Constants, { obtainMsg } from '@ohos/common/src/main/ets/default/constants/PluginConstants'; const parentPort = worker.parentPort; const TAG = `${parentPort.name} Worker`; -- Gitee