From 762f7367872023e2af821de9951040f7d97a8272 Mon Sep 17 00:00:00 2001 From: sunhaiyang Date: Thu, 27 Apr 2023 19:03:52 +0800 Subject: [PATCH] =?UTF-8?q?product=E5=B1=82=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 24 - .../main/ets/default/utils/BundleParseUtil.ts | 4 +- .../ets/com/ohos/model/bundleResourceModel.ts | 2 +- .../systemui/phone/dropdownpanel/.gitignore | 1 - .../phone/dropdownpanel/package-lock.json | 369 ---------- .../systemui/phone/dropdownpanel/package.json | 28 - .../src/main/ets/pages/SCBDropdownPanel.ets | 86 --- .../phone/dropdownpanel/src/main/module.json5 | 10 - .../main/resources/base/element/color.json | 44 -- .../main/resources/base/element/float.json | 140 ---- .../main/resources/base/element/string.json | 104 --- .../main/resources/en_US/element/string.json | 104 --- .../main/resources/zh_CN/element/string.json | 104 --- feature/systemui/phone/statusbar/.gitignore | 1 - .../phone/statusbar/package-lock.json | 130 ---- feature/systemui/phone/statusbar/package.json | 15 - .../ets/pages/common/StyleConfiguration.ts | 28 - .../src/main/ets/pages/common/StyleManager.ts | 47 -- .../src/main/ets/pages/common/constants.ts | 20 - .../phone/statusbar/src/main/module.json5 | 10 - .../main/resources/base/element/float.json | 152 ---- .../main/resources/base/element/string.json | 64 -- .../main/resources/en_US/element/string.json | 48 -- .../main/resources/zh_CN/element/string.json | 48 -- .../src/main/ets/pages/SCBVolumePanel.ets | 20 +- product/phone/package-lock.json | 667 +++++++----------- product/phone/package.json | 15 +- .../src/main/ets/WindowScene/HWScreen.ets | 53 +- .../src/main/ets/WindowScene/HWSystemUi.ets | 61 -- .../dropdownpanel}/DropdownPanel.ets | 114 ++- .../dropdownpanel}/bannerNotification.ets | 12 +- .../common/ControlCenterConfig.ts | 0 .../common/StyleConfiguration.ts | 0 .../dropdownpanel}/common/StyleManager.ts | 0 .../dropdownpanel}/common/constants.ts | 0 .../dropdownpanel}/common/navigationEvent.ts | 0 .../WindowScene/dropdownpanel}/control.ets | 0 .../dropdownpanel}/notification.ets | 0 .../screenlock/common/constants.ts | 0 .../screenlock/pages/SCBScreenLock.ets | 6 +- .../screenlock/pages/customPassword.ets | 2 - .../screenlock/pages/customscreenlock.ets | 0 .../screenlock/pages/digitalPassword.ets | 2 - .../screenlock/pages/journalscreenlock.ets | 0 .../screenlock/pages/mixedPassword.ets | 2 - .../screenlock/pages/slidescreenlock.ets | 0 .../screenlock/vm/indexViewModel.ts | 0 .../screenlock/vm/slideScreenLockViewModel.ts | 0 .../WindowScene/statusbar}/SCBStatusBar.ets | 0 .../ets/WindowScene/statusbar}/StatusBar.ets | 13 +- .../WindowScene/statusbar}/StatusbarConfig.ts | 0 .../phone/src/main/ets/pages/EntryView.ets | 16 + .../screenlock/common/StyleConfiguration.ts | 30 - .../ets/screenlock/common/StyleManager.ts | 51 -- .../main/resources/base/element/color.json | 52 ++ .../main/resources/base/element/float.json | 193 ++++- .../main/resources/base/element/string.json | 140 ++++ .../main/resources/base/media/airplane.svg | 0 .../main/resources/base/media/airplane_d.svg | 0 .../base/media/ic_brightness_plus.svg | 0 .../base/media/ic_brightness_reduce.svg | 0 .../base/media/ic_controlcenter_bt.svg | 0 .../base/media/ic_controlcenter_bt_d.svg | 0 .../base/media/ic_controlcenter_gps.svg | 0 .../ic_controlcenter_ring_off_filled.svg | 0 .../media/ic_controlcenter_ring_on_filled.svg | 0 .../ic_controlcenter_vibration_filled.svg | 0 .../base/media/ic_notification_nfc.svg | 0 .../base/media/ic_notification_nfc_filled.svg | 0 .../resources/base/media/ic_public_delete.svg | 0 .../base/media/ic_public_settings.svg | 0 .../main/resources/base/media/ic_settings.png | Bin .../resources/base/media/ic_status_bt.svg | 0 .../resources/base/media/ic_statusbar_gps.svg | 0 .../base}/media/ic_statusbar_nfc.svg | 0 .../base/media/ic_statusbar_phone.svg | 0 .../media/ic_statusbar_ring_off_filled.svg | 0 .../base/media/ic_statusbar_vibration_on.svg | 0 .../src/main/resources/base/media/wifi.svg | 0 .../src/main/resources/base/media/wifi_d.svg | 0 .../resources/base/profile/main_pages.json | 6 +- .../main/resources/en_US/element/string.json | 128 ++++ .../main/resources/phone/element/float.json | 0 .../phone/media/dropdownpanel_bgc.png | Bin .../resources/phone/media/ic_status_bt.svg | 0 .../phone/media/ic_statusbar_gps.svg | 0 .../phone}/media/ic_statusbar_nfc.svg | 0 .../phone/media/ic_statusbar_phone.svg | 0 .../media/ic_statusbar_ring_off_filled.svg | 0 .../phone/media/ic_statusbar_signal_1.svg | 0 .../phone/media/ic_statusbar_signal_2.svg | 0 .../phone/media/ic_statusbar_signal_3.svg | 0 .../phone/media/ic_statusbar_signal_4.svg | 0 .../phone/media/ic_statusbar_signal_full.svg | 0 .../phone/media/ic_statusbar_signal_no.svg | 0 .../phone/media/ic_statusbar_vibration_on.svg | 0 .../phone/media/ic_statusbar_wifi_1.svg | 0 .../phone/media/ic_statusbar_wifi_2.svg | 0 .../phone/media/ic_statusbar_wifi_3.svg | 0 .../phone/media/ic_statusbar_wifi_full.svg | 0 .../phone/media/ic_statusbar_wifi_no.svg | 0 .../main/resources/zh_CN/element/string.json | 128 ++++ 102 files changed, 1061 insertions(+), 2233 deletions(-) delete mode 100644 feature/systemui/phone/dropdownpanel/.gitignore delete mode 100644 feature/systemui/phone/dropdownpanel/package-lock.json delete mode 100644 feature/systemui/phone/dropdownpanel/package.json delete mode 100644 feature/systemui/phone/dropdownpanel/src/main/ets/pages/SCBDropdownPanel.ets delete mode 100644 feature/systemui/phone/dropdownpanel/src/main/module.json5 delete mode 100644 feature/systemui/phone/dropdownpanel/src/main/resources/base/element/color.json delete mode 100644 feature/systemui/phone/dropdownpanel/src/main/resources/base/element/float.json delete mode 100644 feature/systemui/phone/dropdownpanel/src/main/resources/base/element/string.json delete mode 100644 feature/systemui/phone/dropdownpanel/src/main/resources/en_US/element/string.json delete mode 100644 feature/systemui/phone/dropdownpanel/src/main/resources/zh_CN/element/string.json delete mode 100644 feature/systemui/phone/statusbar/.gitignore delete mode 100644 feature/systemui/phone/statusbar/package-lock.json delete mode 100644 feature/systemui/phone/statusbar/package.json delete mode 100644 feature/systemui/phone/statusbar/src/main/ets/pages/common/StyleConfiguration.ts delete mode 100644 feature/systemui/phone/statusbar/src/main/ets/pages/common/StyleManager.ts delete mode 100644 feature/systemui/phone/statusbar/src/main/ets/pages/common/constants.ts delete mode 100644 feature/systemui/phone/statusbar/src/main/module.json5 delete mode 100644 feature/systemui/phone/statusbar/src/main/resources/base/element/float.json delete mode 100644 feature/systemui/phone/statusbar/src/main/resources/base/element/string.json delete mode 100644 feature/systemui/phone/statusbar/src/main/resources/en_US/element/string.json delete mode 100644 feature/systemui/phone/statusbar/src/main/resources/zh_CN/element/string.json delete mode 100644 product/phone/src/main/ets/WindowScene/HWSystemUi.ets rename {feature/systemui/phone/dropdownpanel/src/main/ets/pages => product/phone/src/main/ets/WindowScene/dropdownpanel}/DropdownPanel.ets (71%) rename {feature/systemui/phone/dropdownpanel/src/main/ets/pages => product/phone/src/main/ets/WindowScene/dropdownpanel}/bannerNotification.ets (94%) rename {feature/systemui/phone/dropdownpanel/src/main/ets/pages => product/phone/src/main/ets/WindowScene/dropdownpanel}/common/ControlCenterConfig.ts (100%) rename {feature/systemui/phone/dropdownpanel/src/main/ets/pages => product/phone/src/main/ets/WindowScene/dropdownpanel}/common/StyleConfiguration.ts (100%) rename {feature/systemui/phone/dropdownpanel/src/main/ets/pages => product/phone/src/main/ets/WindowScene/dropdownpanel}/common/StyleManager.ts (100%) rename {feature/systemui/phone/dropdownpanel/src/main/ets/pages => product/phone/src/main/ets/WindowScene/dropdownpanel}/common/constants.ts (100%) rename {feature/systemui/phone/dropdownpanel/src/main/ets/pages => product/phone/src/main/ets/WindowScene/dropdownpanel}/common/navigationEvent.ts (100%) rename {feature/systemui/phone/dropdownpanel/src/main/ets/pages => product/phone/src/main/ets/WindowScene/dropdownpanel}/control.ets (100%) rename {feature/systemui/phone/dropdownpanel/src/main/ets/pages => product/phone/src/main/ets/WindowScene/dropdownpanel}/notification.ets (100%) rename product/phone/src/main/ets/{ => WindowScene}/screenlock/common/constants.ts (100%) rename product/phone/src/main/ets/{ => WindowScene}/screenlock/pages/SCBScreenLock.ets (95%) rename product/phone/src/main/ets/{ => WindowScene}/screenlock/pages/customPassword.ets (96%) rename product/phone/src/main/ets/{ => WindowScene}/screenlock/pages/customscreenlock.ets (100%) rename product/phone/src/main/ets/{ => WindowScene}/screenlock/pages/digitalPassword.ets (96%) rename product/phone/src/main/ets/{ => WindowScene}/screenlock/pages/journalscreenlock.ets (100%) rename product/phone/src/main/ets/{ => WindowScene}/screenlock/pages/mixedPassword.ets (96%) rename product/phone/src/main/ets/{ => WindowScene}/screenlock/pages/slidescreenlock.ets (100%) rename product/phone/src/main/ets/{ => WindowScene}/screenlock/vm/indexViewModel.ts (100%) rename product/phone/src/main/ets/{ => WindowScene}/screenlock/vm/slideScreenLockViewModel.ts (100%) rename {feature/systemui/phone/statusbar/src/main/ets/pages => product/phone/src/main/ets/WindowScene/statusbar}/SCBStatusBar.ets (100%) rename {feature/systemui/phone/statusbar/src/main/ets/pages => product/phone/src/main/ets/WindowScene/statusbar}/StatusBar.ets (94%) rename {feature/systemui/phone/statusbar/src/main/ets/pages/common => product/phone/src/main/ets/WindowScene/statusbar}/StatusbarConfig.ts (100%) delete mode 100644 product/phone/src/main/ets/screenlock/common/StyleConfiguration.ts delete mode 100644 product/phone/src/main/ets/screenlock/common/StyleManager.ts rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/airplane.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/airplane_d.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/ic_brightness_plus.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/ic_brightness_reduce.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/ic_controlcenter_bt.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/ic_controlcenter_bt_d.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/ic_controlcenter_gps.svg (100%) rename {feature/systemui/ringmodecomponent => product/phone}/src/main/resources/base/media/ic_controlcenter_ring_off_filled.svg (100%) rename {feature/systemui/ringmodecomponent => product/phone}/src/main/resources/base/media/ic_controlcenter_ring_on_filled.svg (100%) rename {feature/systemui/ringmodecomponent => product/phone}/src/main/resources/base/media/ic_controlcenter_vibration_filled.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/ic_notification_nfc.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/ic_notification_nfc_filled.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/ic_public_delete.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/ic_public_settings.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/base/media/ic_settings.png (100%) rename {feature/systemui/phone/statusbar => product/phone}/src/main/resources/base/media/ic_status_bt.svg (100%) rename {feature/systemui/phone/statusbar => product/phone}/src/main/resources/base/media/ic_statusbar_gps.svg (100%) rename {feature/systemui/phone/statusbar/src/main/resources/phone => product/phone/src/main/resources/base}/media/ic_statusbar_nfc.svg (100%) rename {feature/systemui/phone/statusbar => product/phone}/src/main/resources/base/media/ic_statusbar_phone.svg (100%) rename {feature/systemui/ringmodecomponent => product/phone}/src/main/resources/base/media/ic_statusbar_ring_off_filled.svg (100%) rename {feature/systemui/ringmodecomponent => product/phone}/src/main/resources/base/media/ic_statusbar_vibration_on.svg (100%) rename {feature/systemui/wificomponent => product/phone}/src/main/resources/base/media/wifi.svg (100%) rename {feature/systemui/wificomponent => product/phone}/src/main/resources/base/media/wifi_d.svg (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/phone/element/float.json (100%) rename {feature/systemui/phone/dropdownpanel => product/phone}/src/main/resources/phone/media/dropdownpanel_bgc.png (100%) rename {feature/systemui/phone/statusbar => product/phone}/src/main/resources/phone/media/ic_status_bt.svg (100%) rename {feature/systemui/phone/statusbar => product/phone}/src/main/resources/phone/media/ic_statusbar_gps.svg (100%) rename {feature/systemui/statusbarcomponent/src/main/resources/base => product/phone/src/main/resources/phone}/media/ic_statusbar_nfc.svg (100%) rename {feature/systemui/phone/statusbar => product/phone}/src/main/resources/phone/media/ic_statusbar_phone.svg (100%) rename {feature/systemui/ringmodecomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_ring_off_filled.svg (100%) rename {feature/systemui/signalcomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_signal_1.svg (100%) rename {feature/systemui/signalcomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_signal_2.svg (100%) rename {feature/systemui/signalcomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_signal_3.svg (100%) rename {feature/systemui/signalcomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_signal_4.svg (100%) rename {feature/systemui/signalcomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_signal_full.svg (100%) rename {feature/systemui/signalcomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_signal_no.svg (100%) rename {feature/systemui/ringmodecomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_vibration_on.svg (100%) rename {feature/systemui/wificomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_wifi_1.svg (100%) rename {feature/systemui/wificomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_wifi_2.svg (100%) rename {feature/systemui/wificomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_wifi_3.svg (100%) rename {feature/systemui/wificomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_wifi_full.svg (100%) rename {feature/systemui/wificomponent => product/phone}/src/main/resources/phone/media/ic_statusbar_wifi_no.svg (100%) diff --git a/build-profile.json5 b/build-profile.json5 index ffd3e056..f55d2746 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -381,30 +381,6 @@ } ] }, - { - "name": "phone_statusbar", - "srcPath": "./feature/systemui/phone/statusbar", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - }, - { - "name": "phone_dropdownpanel", - "srcPath": "./feature/systemui/phone/dropdownpanel", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - }, { "name": "screenlock", "srcPath": "./feature/systemui/screenlock", diff --git a/common/src/main/ets/default/utils/BundleParseUtil.ts b/common/src/main/ets/default/utils/BundleParseUtil.ts index 5815844e..f355d43b 100644 --- a/common/src/main/ets/default/utils/BundleParseUtil.ts +++ b/common/src/main/ets/default/utils/BundleParseUtil.ts @@ -20,7 +20,7 @@ import { ExtensionAbilityInfo } from 'bundleManager/ExtensionAbilityInfo'; import { CustomizeData } from 'bundle/customizeData'; import { Metadata } from 'bundleManager/Metadata'; import { Log } from './Log'; -import switchUserManager from '../manager/SwitchUserManager'; +import { SwitchUserManager } from '../manager/SwitchUserManager'; export type AbilityInfoWithId = (AbilityInfo | ExtensionAbilityInfo) & { itemId: string }; export type BundleListener = { @@ -159,7 +159,7 @@ export function registerBundleListener(listener: BundleListener, callback: (hand return; } - switchUserManager.getInstance() + SwitchUserManager.getInstance() .getCurrentUserInfo() .then((userInfo) => { if (data.parameters.userId != userInfo.userId) { 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 d2d17355..2979003f 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/manager/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/phone/dropdownpanel/.gitignore b/feature/systemui/phone/dropdownpanel/.gitignore deleted file mode 100644 index c795b054..00000000 --- a/feature/systemui/phone/dropdownpanel/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build \ No newline at end of file diff --git a/feature/systemui/phone/dropdownpanel/package-lock.json b/feature/systemui/phone/dropdownpanel/package-lock.json deleted file mode 100644 index fc7a5fc2..00000000 --- a/feature/systemui/phone/dropdownpanel/package-lock.json +++ /dev/null @@ -1,369 +0,0 @@ -{ - "name": "@ohos/phone_dropdownpanel", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/airplanecomponent": { - "version": "file:../../airplanecomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/autorotatecomponent": { - "version": "file:../../autorotatecomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/batterycomponent": { - "version": "file:../../batterycomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/bluetoothcomponent": { - "version": "file:../../bluetoothcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/brightnesscomponent": { - "version": "file:../../brightnesscomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/clockcomponent": { - "version": "file:../../clockcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/common": { - "version": "file:../../../../common" - }, - "@ohos/controlcentercomponent": { - "version": "file:../../controlcentercomponent", - "requires": { - "@ohos/airplanecomponent": "file:../../airplanecomponent", - "@ohos/autorotatecomponent": "file:../../autorotatecomponent", - "@ohos/bluetoothcomponent": "file:../../bluetoothcomponent", - "@ohos/brightnesscomponent": "file:../../brightnesscomponent", - "@ohos/common": "file:../../../../common", - "@ohos/locationcomponent": "file:../../locationcomponent", - "@ohos/nfccomponent": "file:../../nfccomponent", - "@ohos/ringmodecomponent": "file:../../ringmodecomponent", - "@ohos/wificomponent": "file:../../wificomponent" - }, - "dependencies": { - "@ohos/airplanecomponent": { - "version": "file:../../airplanecomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/autorotatecomponent": { - "version": "file:../../autorotatecomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/bluetoothcomponent": { - "version": "file:../../bluetoothcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/brightnesscomponent": { - "version": "file:../../brightnesscomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/common": { - "version": "file:../../../../common" - }, - "@ohos/locationcomponent": { - "version": "file:../../locationcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/nfccomponent": { - "version": "file:../../nfccomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/ringmodecomponent": { - "version": "file:../../ringmodecomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/wificomponent": { - "version": "file:../../wificomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - } - } - }, - "@ohos/locationcomponent": { - "version": "file:../../locationcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/nfccomponent": { - "version": "file:../../nfccomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/noticeitem": { - "version": "file:../../noticeitem", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/ringmodecomponent": { - "version": "file:../../ringmodecomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/signalcomponent": { - "version": "file:../../signalcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/statusbarcomponent": { - "version": "file:../../statusbarcomponent", - "requires": { - "@ohos/batterycomponent": "file:../../batterycomponent", - "@ohos/bluetoothcomponent": "file:../../bluetoothcomponent", - "@ohos/capsulecomponent": "file:../../capsulecomponent", - "@ohos/clockcomponent": "file:../../clockcomponent", - "@ohos/common": "file:../../../../common", - "@ohos/locationcomponent": "file:../../locationcomponent", - "@ohos/nfccomponent": "file:../../nfccomponent", - "@ohos/ringmodecomponent": "file:../../ringmodecomponent", - "@ohos/signalcomponent": "file:../../signalcomponent", - "@ohos/wificomponent": "file:../../wificomponent" - }, - "dependencies": { - "@ohos/batterycomponent": { - "version": "file:../../batterycomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/bluetoothcomponent": { - "version": "file:../../bluetoothcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/capsulecomponent": { - "version": "file:../../capsulecomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/clockcomponent": { - "version": "file:../../clockcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/common": { - "version": "file:../../../../common" - }, - "@ohos/locationcomponent": { - "version": "file:../../locationcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/nfccomponent": { - "version": "file:../../nfccomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/ringmodecomponent": { - "version": "file:../../ringmodecomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/signalcomponent": { - "version": "file:../../signalcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/wificomponent": { - "version": "file:../../wificomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - } - } - }, - "@ohos/wificomponent": { - "version": "file:../../wificomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - } - } -} diff --git a/feature/systemui/phone/dropdownpanel/package.json b/feature/systemui/phone/dropdownpanel/package.json deleted file mode 100644 index 6534c5b9..00000000 --- a/feature/systemui/phone/dropdownpanel/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "devDependencies": {}, - "name": "@ohos/phone_dropdownpanel", - "ohos": { - "org": "huawei", - "directoryLevel": "module", - "buildTool": "hvigor" - }, - "version": "1.0.0", - "type": "module", - "dependencies": { - "@ohos/statusbarcomponent": "file:../../statusbarcomponent", - "@ohos/wificomponent": "file:../../wificomponent", - "@ohos/bluetoothcomponent": "file:../../bluetoothcomponent", - "@ohos/signalcomponent": "file:../../signalcomponent", - "@ohos/clockcomponent": "file:../../clockcomponent", - "@ohos/locationcomponent": "file:../../locationcomponent", - "@ohos/batterycomponent": "file:../../batterycomponent", - "@ohos/controlcentercomponent": "file:../../controlcentercomponent", - "@ohos/ringmodecomponent": "file:../../ringmodecomponent", - "@ohos/autorotatecomponent": "file:../../autorotatecomponent", - "@ohos/airplanecomponent": "file:../../airplanecomponent", - "@ohos/brightnesscomponent": "file:../../brightnesscomponent", - "@ohos/nfccomponent": "../../nfccomponent", - "@ohos/noticeitem": "file:../../noticeitem", - "@ohos/common": "../../../../common" - } -} diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/SCBDropdownPanel.ets b/feature/systemui/phone/dropdownpanel/src/main/ets/pages/SCBDropdownPanel.ets deleted file mode 100644 index 0bbec2de..00000000 --- a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/SCBDropdownPanel.ets +++ /dev/null @@ -1,86 +0,0 @@ -//@ts-nocheck -/* - * 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 AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; -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/manager/WindowPanelManager' -import { DropdownPanel } from './DropdownPanel'; -import { BannerNotificationPanel } from './bannerNotification'; -import screenSessionManager from '@ohos.screenSessionManager'; - -const TAG = 'SCBDropdownPanel' - -@Component -export struct SCBDropdownPanel { - public bounds: screenSessionManager.RRect; - public moduleName: string = '' - @State showComponentName: string = undefined; - @StorageLink(SystemUi_DropdownPanel) mDropDownInfo: WindowInfo = WindowPanelManager.getWindowInfo(WindowType.DROPDOWN_PANEL); - @StorageLink(SystemUi_BannerNotice) mBannerInfo: WindowInfo = WindowPanelManager.getWindowInfo(WindowType.BANNER_NOTICE); - - onBackPress(): boolean { - return true - } - - aboutToAppear() { - Log.showInfo(TAG, `aboutToAppear, start`); - this.init(); - Log.showDebug(TAG, `aboutToAppear, end`); - } - - private init() { - AbilityManager.setContext(AbilityManager.ABILITY_NAME_DROPDOWN_PANEL, getContext(this)); - - let rect = { - left: 0, - top: 0, - width: this.bounds.width, - height: this.bounds.height, - }; - AbilityManager.setAbilityData(AbilityManager.ABILITY_NAME_DROPDOWN_PANEL, 'rect', rect); - this.mDropDownInfo.rect = rect; - - let bannerRect = { - left: 0, - top: this.bounds.height / 5, - width: this.bounds.width, - height: this.bounds.height / 20 - }; - AbilityManager.setAbilityData(AbilityManager.ABILITY_NAME_BANNER_NOTICE, 'bannerRect', bannerRect); - this.mBannerInfo.rect = bannerRect; - } - - aboutToDisappear() { - Log.showInfo(TAG, `aboutToDisappear`) - } - - build() { - Stack({ alignContent: Alignment.Top }) { - // dropdown panel - DropdownPanel({moduleName: this.moduleName}) - .hitTestBehavior(HitTestMode.Transparent) - - // BannerNotification - BannerNotificationPanel() - .hitTestBehavior(HitTestMode.Default) - .width(this.mBannerInfo.rect.width + 'px') - .height(this.mBannerInfo.rect.height + 'px') - .position({x: this.mBannerInfo.rect.left + 'px', y: this.mBannerInfo.rect.top + 'px'}) - } - } -} diff --git a/feature/systemui/phone/dropdownpanel/src/main/module.json5 b/feature/systemui/phone/dropdownpanel/src/main/module.json5 deleted file mode 100644 index cae87755..00000000 --- a/feature/systemui/phone/dropdownpanel/src/main/module.json5 +++ /dev/null @@ -1,10 +0,0 @@ -{ - "module": { - "name": "phone_dropdownpanel", - "type": "har", - "deviceTypes": [ - "default" - ], - "uiSyntax": "ets" - } -} \ No newline at end of file diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/element/color.json b/feature/systemui/phone/dropdownpanel/src/main/resources/base/element/color.json deleted file mode 100644 index 1601adf7..00000000 --- a/feature/systemui/phone/dropdownpanel/src/main/resources/base/element/color.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "color": [ - { - "name": "default_background", - "value": "#999999" - }, - { - "name": "notification_delete_all_background", - "value": "#4C000000" - }, - { - "name": "default_font_color", - "value": "#ffffffff" - }, - { - "name": "quickly_setting_time_font_color", - "value": "#ffffffff" - }, - { - "name": "quickly_setting_date_font_color", - "value": "#ffffffff" - }, - { - "name": "statusbar_background_color", - "value": "#00ffff00" - }, - { - "name": "brightness_slider_block_color", - "value": "#FFFFFFFF" - }, - { - "name": "brightness_slider_track_color", - "value": "#1A000000" - }, - { - "name": "brightness_slider_selected_color", - "value": "#FF007DFF" - }, - { - "name": "control_center_complex_toggle_ring_mode_on_bg_color", - "value": "#FFFF9800" - } - ] -} \ No newline at end of file diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/element/float.json b/feature/systemui/phone/dropdownpanel/src/main/resources/base/element/float.json deleted file mode 100644 index a698877b..00000000 --- a/feature/systemui/phone/dropdownpanel/src/main/resources/base/element/float.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "float": [ - { - "name": "status_bar_margin_left_right", - "value": "5vp" - }, - { - "name": "status_bar_height", - "value": "46vp" - }, - { - "name": "phone_status_bar_height", - "value": "39vp" - }, - { - "name": "notification_delete_all", - "value": "32" - }, - { - "name": "quickly_setting_time_font_size", - "value": "30fp" - }, - { - "name": "quickly_setting_date_font_size", - "value": "20fp" - }, - { - "name": "quickly_setting_text_flex_margin_left", - "value": "10vp" - }, - { - "name": "quickly_setting_image_width", - "value": "50vp" - }, - { - "name": "quickly_setting_image_height", - "value": "50vp" - }, - { - "name": "quickly_setting_image_margin_right", - "value": "10vp" - }, - { - "name": "quickly_setting_border_radius", - "value": "20vp" - }, - { - "name": "quickly_setting_margin_left", - "value": "10vp" - }, - { - "name": "quickly_setting_margin_right", - "value": "10vp" - }, - { - "name": "delete_all_image_width", - "value": "50vp" - }, - { - "name": "delete_all_image_height", - "value": "50vp" - }, - { - "name": "delete_all_image_border_radius", - "value": "25vp" - }, - { - "name": "delete_all_image_opacity", - "value": "0.9" - }, - { - "name": "brightness_margin_left", - "value": "26vp" - }, - { - "name": "brightness_margin_right", - "value": "26vp" - }, - { - "name": "brightness_component_gap", - "value": "26vp" - }, - { - "name": "brightness_reduce_width", - "value": "44vp" - }, - { - "name": "brightness_reduce_height", - "value": "44vp" - }, - { - "name": "brightness_plus_width", - "value": "44vp" - }, - { - "name": "brightness_plus_height", - "value": "44vp" - }, - { - "name": "brightness_height", - "value": "44vp" - }, - { - "name": "brightness_slider_height", - "value": "40vp" - }, - { - "name": "status_bar_location_width", - "value": "20vp" - }, - { - "name": "status_bar_location_height", - "value": "24vp" - }, - { - "name": "status_bar_ring_mode_width", - "value": "27vp" - }, - { - "name": "status_bar_ring_mode_height", - "value": "24vp" - }, - { - "name": "status_bar_padding_left_right", - "value": "12vp" - }, - { - "name": "status_bar_padding_top_bottom", - "value": "4vp" - }, - { - "name": "notification_title_setting_icon_width", - "value": "48px" - }, - { - "name": "notification_title_setting_icon_height", - "value": "48px" - } - ] -} \ No newline at end of file diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/element/string.json b/feature/systemui/phone/dropdownpanel/src/main/resources/base/element/string.json deleted file mode 100644 index 7f420f4a..00000000 --- a/feature/systemui/phone/dropdownpanel/src/main/resources/base/element/string.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "string": [ - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - }, - { - "name": "monday", - "value": "星期一" - }, - { - "name": "tuesday", - "value": "星期二" - }, - { - "name": "wednesday", - "value": "星期三" - }, - { - "name": "thursday", - "value": "星期四" - }, - { - "name": "friday", - "value": "星期五" - }, - { - "name": "saturday", - "value": "星期六" - }, - { - "name": "sunday", - "value": "星期日" - }, - { - "name": "day", - "value": "日" - }, - { - "name": "month", - "value": "月" - }, - { - "name": "no_notification", - "value": "没有通知" - }, - { - "name": "airplane_mode", - "value": "飞行模式" - }, - { - "name": "control_center_complex_toggle_bluetooth_title", - "value": "蓝牙" - }, - { - "name": "control_center_complex_toggle_location_title", - "value": "位置信息" - }, - { - "name": "control_center_complex_toggle_ring_mode_title_on", - "value": "响铃" - }, - { - "name": "control_center_complex_toggle_ring_mode_title_off", - "value": "静音" - }, - { - "name": "control_center_complex_toggle_ring_mode_title_vibration", - "value": "振动" - }, - { - "name": "status_bar_position_landscape", - "value": "2" - }, - { - "name": "nav_bar_position_landscape", - "value": "4" - }, - { - "name": "status_bar_size_landscape", - "value": "48" - }, - { - "name": "nav_bar_size_landscape", - "value": "36" - }, - { - "name": "status_bar_position_portrait", - "value": "2" - }, - { - "name": "nav_bar_position_portrait", - "value": "4" - }, - { - "name": "nav_bar_size_portrait", - "value": "36" - }, - { - "name": "control_center_complex_toggle_nfc_mode_title", - "value": "NFC" - } - ] -} \ No newline at end of file diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/en_US/element/string.json b/feature/systemui/phone/dropdownpanel/src/main/resources/en_US/element/string.json deleted file mode 100644 index aaf028b4..00000000 --- a/feature/systemui/phone/dropdownpanel/src/main/resources/en_US/element/string.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "string": [ - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - }, - { - "name": "monday", - "value": "monday" - }, - { - "name": "tuesday", - "value": "tuesday" - }, - { - "name": "wednesday", - "value": "wednesday" - }, - { - "name": "thursday", - "value": "thursday" - }, - { - "name": "friday", - "value": "friday" - }, - { - "name": "saturday", - "value": "saturday" - }, - { - "name": "sunday", - "value": "sunday" - }, - { - "name": "day", - "value": "day" - }, - { - "name": "month", - "value": "month" - }, - { - "name": "no_notification", - "value": "No Notification" - }, - { - "name": "airplane_mode", - "value": "Airplane mode" - }, - { - "name": "control_center_complex_toggle_bluetooth_title", - "value": "Bluetooth" - }, - { - "name": "control_center_complex_toggle_location_title", - "value": "Location" - }, - { - "name": "control_center_complex_toggle_ring_mode_title_on", - "value": "Sound" - }, - { - "name": "control_center_complex_toggle_ring_mode_title_off", - "value": "Silent" - }, - { - "name": "control_center_complex_toggle_ring_mode_title_vibration", - "value": "Vibration" - }, - { - "name": "status_bar_position_landscape", - "value": "2" - }, - { - "name": "nav_bar_position_landscape", - "value": "4" - }, - { - "name": "status_bar_size_landscape", - "value": "48" - }, - { - "name": "nav_bar_size_landscape", - "value": "36" - }, - { - "name": "status_bar_position_portrait", - "value": "2" - }, - { - "name": "nav_bar_position_portrait", - "value": "4" - }, - { - "name": "nav_bar_size_portrait", - "value": "36" - }, - { - "name": "control_center_complex_toggle_nfc_mode_title", - "value": "NFC" - } - ] -} \ No newline at end of file diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/zh_CN/element/string.json b/feature/systemui/phone/dropdownpanel/src/main/resources/zh_CN/element/string.json deleted file mode 100644 index 7f420f4a..00000000 --- a/feature/systemui/phone/dropdownpanel/src/main/resources/zh_CN/element/string.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "string": [ - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - }, - { - "name": "monday", - "value": "星期一" - }, - { - "name": "tuesday", - "value": "星期二" - }, - { - "name": "wednesday", - "value": "星期三" - }, - { - "name": "thursday", - "value": "星期四" - }, - { - "name": "friday", - "value": "星期五" - }, - { - "name": "saturday", - "value": "星期六" - }, - { - "name": "sunday", - "value": "星期日" - }, - { - "name": "day", - "value": "日" - }, - { - "name": "month", - "value": "月" - }, - { - "name": "no_notification", - "value": "没有通知" - }, - { - "name": "airplane_mode", - "value": "飞行模式" - }, - { - "name": "control_center_complex_toggle_bluetooth_title", - "value": "蓝牙" - }, - { - "name": "control_center_complex_toggle_location_title", - "value": "位置信息" - }, - { - "name": "control_center_complex_toggle_ring_mode_title_on", - "value": "响铃" - }, - { - "name": "control_center_complex_toggle_ring_mode_title_off", - "value": "静音" - }, - { - "name": "control_center_complex_toggle_ring_mode_title_vibration", - "value": "振动" - }, - { - "name": "status_bar_position_landscape", - "value": "2" - }, - { - "name": "nav_bar_position_landscape", - "value": "4" - }, - { - "name": "status_bar_size_landscape", - "value": "48" - }, - { - "name": "nav_bar_size_landscape", - "value": "36" - }, - { - "name": "status_bar_position_portrait", - "value": "2" - }, - { - "name": "nav_bar_position_portrait", - "value": "4" - }, - { - "name": "nav_bar_size_portrait", - "value": "36" - }, - { - "name": "control_center_complex_toggle_nfc_mode_title", - "value": "NFC" - } - ] -} \ No newline at end of file diff --git a/feature/systemui/phone/statusbar/.gitignore b/feature/systemui/phone/statusbar/.gitignore deleted file mode 100644 index c795b054..00000000 --- a/feature/systemui/phone/statusbar/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build \ No newline at end of file diff --git a/feature/systemui/phone/statusbar/package-lock.json b/feature/systemui/phone/statusbar/package-lock.json deleted file mode 100644 index 3f27340d..00000000 --- a/feature/systemui/phone/statusbar/package-lock.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "name": "@ohos/phone_statusbar", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - }, - "@ohos/statusbarcomponent": { - "version": "file:../../statusbarcomponent", - "requires": { - "@ohos/batterycomponent": "file:../../batterycomponent", - "@ohos/bluetoothcomponent": "file:../../bluetoothcomponent", - "@ohos/capsulecomponent": "file:../../capsulecomponent", - "@ohos/clockcomponent": "file:../../clockcomponent", - "@ohos/common": "file:../../../../common", - "@ohos/locationcomponent": "file:../../locationcomponent", - "@ohos/nfccomponent": "file:../../nfccomponent", - "@ohos/ringmodecomponent": "file:../../ringmodecomponent", - "@ohos/signalcomponent": "file:../../signalcomponent", - "@ohos/wificomponent": "file:../../wificomponent" - }, - "dependencies": { - "@ohos/batterycomponent": { - "version": "file:../../batterycomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/bluetoothcomponent": { - "version": "file:../../bluetoothcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/capsulecomponent": { - "version": "file:../../capsulecomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/clockcomponent": { - "version": "file:../../clockcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/common": { - "version": "file:../../../../common" - }, - "@ohos/locationcomponent": { - "version": "file:../../locationcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/nfccomponent": { - "version": "file:../../nfccomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/ringmodecomponent": { - "version": "file:../../ringmodecomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/signalcomponent": { - "version": "file:../../signalcomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - }, - "@ohos/wificomponent": { - "version": "file:../../wificomponent", - "requires": { - "@ohos/common": "file:../../../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../../../common" - } - } - } - } - } - } -} diff --git a/feature/systemui/phone/statusbar/package.json b/feature/systemui/phone/statusbar/package.json deleted file mode 100644 index 263647f7..00000000 --- a/feature/systemui/phone/statusbar/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "devDependencies": {}, - "name": "@ohos/phone_statusbar", - "ohos": { - "org": "huawei", - "directoryLevel": "module", - "buildTool": "hvigor" - }, - "version": "1.0.0", - "type": "module", - "dependencies": { - "@ohos/statusbarcomponent": "../../statusbarcomponent", - "@ohos/common": "../../../../common" - } -} 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 deleted file mode 100644 index 7e7ef2cc..00000000 --- a/feature/systemui/phone/statusbar/src/main/ets/pages/common/StyleConfiguration.ts +++ /dev/null @@ -1,28 +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 '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; - -const TAG = 'StatusBar-StyleConfiguration'; - -export class IndexStyle { -} - -export default class StyleConfiguration { - static getIndexStyle(): IndexStyle { - const key: string = TAG + '-Index'; - return CommonStyleManager.getStyle(key, IndexStyle); - } -} \ No newline at end of file diff --git a/feature/systemui/phone/statusbar/src/main/ets/pages/common/StyleManager.ts b/feature/systemui/phone/statusbar/src/main/ets/pages/common/StyleManager.ts deleted file mode 100644 index f8aa3b39..00000000 --- a/feature/systemui/phone/statusbar/src/main/ets/pages/common/StyleManager.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. - */ -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; - -const TAG = 'StatusBar-StyleManager'; - -export default class StyleManager { - static readonly STANDARD_DISPLAY_WIDTH = 720; - static readonly STANDARD_DISPLAY_HEIGHT = 1280; - static maxWidth: number = StyleManager.STANDARD_DISPLAY_WIDTH; - - static setStyle(): void { - Log.showDebug(TAG, 'setStyle'); - - let config = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'config'); - StyleManager.maxWidth = config.maxWidth; - - // xxx - { - } - } - - static number2px(n: number): string { - return n.toString() + 'px'; - } - - static calcScaleSize(n: number): number { - return n * StyleManager.maxWidth / StyleManager.STANDARD_DISPLAY_WIDTH; - } - - static calcScaleSizePx(n: number): string { - return StyleManager.number2px(StyleManager.calcScaleSize(n)); - } -} \ No newline at end of file diff --git a/feature/systemui/phone/statusbar/src/main/ets/pages/common/constants.ts b/feature/systemui/phone/statusbar/src/main/ets/pages/common/constants.ts deleted file mode 100644 index 53f97c35..00000000 --- a/feature/systemui/phone/statusbar/src/main/ets/pages/common/constants.ts +++ /dev/null @@ -1,20 +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 Constants { - static readonly TOUCHTYPE_DOWN = 0; - static readonly TOUCHTYPE_UP = 1; - static readonly TOUCHTYPE_MOVE = 2; -} \ No newline at end of file diff --git a/feature/systemui/phone/statusbar/src/main/module.json5 b/feature/systemui/phone/statusbar/src/main/module.json5 deleted file mode 100644 index 53f35bd3..00000000 --- a/feature/systemui/phone/statusbar/src/main/module.json5 +++ /dev/null @@ -1,10 +0,0 @@ -{ - "module": { - "name": "phone_statusbar", - "type": "har", - "deviceTypes": [ - "default" - ], - "uiSyntax": "ets" - } -} \ No newline at end of file diff --git a/feature/systemui/phone/statusbar/src/main/resources/base/element/float.json b/feature/systemui/phone/statusbar/src/main/resources/base/element/float.json deleted file mode 100644 index fdb640c9..00000000 --- a/feature/systemui/phone/statusbar/src/main/resources/base/element/float.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "float": [ - { - "name": "status_bar_clock_width", - "value": "37vp" - }, - { - "name": "battery_component_gap", - "value": "0vp" - }, - { - "name": "battery_component_pic_gap", - "value": "1.2vp" - }, - { - "name": "battery_component_pic_body_height", - "value": "11vp" - }, - { - "name": "battery_component_pic_body_width", - "value": "18.5vp" - }, - { - "name": "battery_component_pic_body_padding", - "value": "1vp" - }, - { - "name": "battery_component_pic_body_border_width", - "value": "1vp" - }, - { - "name": "battery_component_pic_border_radius", - "value": "2.5vp" - }, - { - "name": "battery_component_pic_head_radius", - "value": "3vp" - }, - { - "name": "battery_component_pic_head_width", - "value": "1.5vp" - }, - { - "name": "battery_component_pic_head_height", - "value": "5.75vp" - }, - { - "name": "green_capsule_phone_width", - "value": "14vp" - }, - { - "name": "green_capsule_phone_height", - "value": "14vp" - }, - { - "name": "green_capsule_height", - "value": "20vp" - }, - { - "name": "green_capsule_text_left_right", - "value": "6vp" - }, - { - "name": "green_capsule_radius", - "value": "10vp" - }, - { - "name": "signal_component_icon_width", - "value": "21.5vp" - }, - { - "name": "signal_component_icon_height", - "value": "15vp" - }, - { - "name": "status_bar_signal_unknown_font_size", - "value": "7fp" - }, - { - "name": "signal_text_max_width", - "value": "113vp" - }, - { - "name": "status_bar_signal_net_signal_text_max_width", - "value": "15vp" - }, - { - "name": "status_bar_bluetooth_width", - "value": "11.5vp" - }, - { - "name": "status_bar_bluetooth_height", - "value": "15vp" - }, - { - "name": "status_bar_ring_mode_width", - "value": "17vp" - }, - { - "name": "status_bar_ring_mode_height", - "value": "15vp" - }, - { - "name": "status_bar_signal_type_font_size", - "value": "5.5fp" - }, - { - "name": "status_bar_wifi_width", - "value": "15.75vp" - }, - { - "name": "status_bar_wifi_height", - "value": "15vp" - }, - { - "name": "status_bar_location_width", - "value": "13vp" - }, - { - "name": "status_bar_location_height", - "value": "15vp" - }, - { - "name": "icon_component_opacity", - "value": "0.7" - }, - { - "name": "mTime_text_margin_left", - "value": "2vp" - }, - { - "name": "signal_component_text_margin_left", - "value": "3vp" - }, - { - "name": "green_capsule_phone_text_left", - "value": "1vp" - }, - { - "name": "green_capsule_phone_margin_left", - "value": "2vp" - }, - { - "name": "battery_component_margin", - "value": "2vp" - }, - { - "name": "status_bar_margin_left_right", - "value": "5vp" - } - ] -} \ No newline at end of file diff --git a/feature/systemui/phone/statusbar/src/main/resources/base/element/string.json b/feature/systemui/phone/statusbar/src/main/resources/base/element/string.json deleted file mode 100644 index 4d06d0d7..00000000 --- a/feature/systemui/phone/statusbar/src/main/resources/base/element/string.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "string": [ - { - "name": "status_bar_size_portrait", - "value": "36" - }, - { - "name": "status_bar_size_landscape", - "value": "36" - }, - { - "name": "phone_status_bar_size_portrait", - "value": "54" - }, - { - "name": "phone_status_bar_size_landscape", - "value": "54" - }, - { - "name": "status_bar_position_landscape", - "value": "2" - }, - { - "name": "status_bar_position_portrait", - "value": "2" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - }, - { - "name": "net_null", - "value": "没有 SIM 卡" - }, - { - "name": "2G", - "value": "2G" - }, - { - "name": "3G", - "value": "3G" - }, - { - "name": "4G", - "value": "4G" - }, - { - "name": "5G", - "value": "5G" - }, - { - "name": "signal_null", - "value": "×" - }, - { - "name": "incoming_call", - "value": "来电" - }, - { - "name": "communicate_by_phone", - "value": "通话" - } - ] -} \ No newline at end of file diff --git a/feature/systemui/phone/statusbar/src/main/resources/en_US/element/string.json b/feature/systemui/phone/statusbar/src/main/resources/en_US/element/string.json deleted file mode 100644 index 7da82deb..00000000 --- a/feature/systemui/phone/statusbar/src/main/resources/en_US/element/string.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "string": [ - { - "name": "status_bar_position_landscape", - "value": "2" - }, - { - "name": "status_bar_position_portrait", - "value": "2" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - }, - { - "name": "net_null", - "value": "No SIM" - }, - { - "name": "2G", - "value": "2G" - }, - { - "name": "3G", - "value": "3G" - }, - { - "name": "4G", - "value": "4G" - }, - { - "name": "5G", - "value": "5G" - }, - { - "name": "signal_null", - "value": "×" - }, - { - "name": "incoming_call", - "value": "Incoming call" - }, - { - "name": "communicate_by_phone", - "value": "communicate" - } - ] -} \ No newline at end of file diff --git a/feature/systemui/phone/statusbar/src/main/resources/zh_CN/element/string.json b/feature/systemui/phone/statusbar/src/main/resources/zh_CN/element/string.json deleted file mode 100644 index 8edb6a13..00000000 --- a/feature/systemui/phone/statusbar/src/main/resources/zh_CN/element/string.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "string": [ - { - "name": "status_bar_position_landscape", - "value": "2" - }, - { - "name": "status_bar_position_portrait", - "value": "2" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - }, - { - "name": "net_null", - "value": "没有 SIM 卡" - }, - { - "name": "2G", - "value": "2G" - }, - { - "name": "3G", - "value": "3G" - }, - { - "name": "4G", - "value": "4G" - }, - { - "name": "5G", - "value": "5G" - }, - { - "name": "signal_null", - "value": "×" - }, - { - "name": "incoming_call", - "value": "来电" - }, - { - "name": "communicate_by_phone", - "value": "通话" - } - ] -} \ No newline at end of file diff --git a/feature/systemui/volumepanel/src/main/ets/pages/SCBVolumePanel.ets b/feature/systemui/volumepanel/src/main/ets/pages/SCBVolumePanel.ets index c01c63ba..9c70a972 100644 --- a/feature/systemui/volumepanel/src/main/ets/pages/SCBVolumePanel.ets +++ b/feature/systemui/volumepanel/src/main/ets/pages/SCBVolumePanel.ets @@ -18,7 +18,8 @@ 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/Constants' +import WindowPanelManager, { WindowType } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager' +import VolumePanelVM from '@ohos/volumepanelcomponent/src/main/ets/com/ohos/viewmodel/VolumePanelVM' const TAG = 'SCBVolumePanel' @@ -29,12 +30,14 @@ class ShowControl { async show() { Log.showInfo(TAG, "show"); this.mIsShown = true; + WindowPanelManager.showWindow(WindowType.VOLUME_PANEL); return; } async hide() { Log.showInfo(TAG, "hide"); this.mIsShown = false; + WindowPanelManager.hideWindow(WindowType.VOLUME_PANEL); return; } } @@ -42,12 +45,6 @@ class ShowControl { @Component export struct SCBVolumePanel { public bounds: screenSessionManager.RRect - @State mVolumeRect: Area = { - left: 0, - top: 0, - width: 0, - height: 0 - } @State mShowControl: ShowControl = new ShowControl(); aboutToAppear() { @@ -75,9 +72,8 @@ export struct SCBVolumePanel { }; } AbilityManager.setAbilityData(AbilityManager.ABILITY_NAME_VOLUME_PANEL, 'rect', volumeRect); - this.mVolumeRect = volumeRect; + WindowPanelManager.resetSizeWindow(WindowType.VOLUME_PANEL, volumeRect); - setAppBgColor('#00000000'); Log.showDebug(TAG, `configInfo Start, configInfo ${JSON.stringify(configInfo)}`); if (configInfo.width > configInfo.height) { // Pad、PC Mode StyleManager.setStyle(); @@ -91,6 +87,7 @@ export struct SCBVolumePanel { height: this.bounds.height, }); VolumeWindowController.getInstance().setWindowHandle(this.mShowControl); + VolumePanelVM.initViewModel(); } aboutToDisappear() { @@ -102,9 +99,8 @@ export struct SCBVolumePanel { Column() { VolumePanelComponent() } - .width(this.mVolumeRect.width + 'px') - .height(this.mVolumeRect.height + 'px') - .position({x:this.mVolumeRect.left + 'px', y:this.mVolumeRect.top + 'px'}) + .width('100%') + .height('100%') } } } diff --git a/product/phone/package-lock.json b/product/phone/package-lock.json index 3e8bbee9..b93a1b79 100644 --- a/product/phone/package-lock.json +++ b/product/phone/package-lock.json @@ -4,8 +4,8 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@ohos/bigfolder": { - "version": "file:../../feature/bigfolder", + "@ohos/airplanecomponent": { + "version": "file:../../feature/systemui/airplanecomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -15,11 +15,8 @@ } } }, - "@ohos/common": { - "version": "file:../../common" - }, - "@ohos/datetimecomponent": { - "version": "file:../../feature/systemui/datetimecomponent", + "@ohos/autorotatecomponent": { + "version": "file:../../feature/systemui/autorotatecomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -29,31 +26,19 @@ } } }, - "@ohos/default_volumepanel": { - "version": "file:../../feature/systemui/volumepanel", + "@ohos/batterycomponent": { + "version": "file:../../feature/systemui/batterycomponent", "requires": { - "@ohos/common": "file:../../common", - "@ohos/volumepanelcomponent": "file:../../feature/systemui/volumepanelcomponent" + "@ohos/common": "file:../../common" }, "dependencies": { "@ohos/common": { "version": "file:../../common" - }, - "@ohos/volumepanelcomponent": { - "version": "file:../../feature/systemui/volumepanelcomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } } } }, - "@ohos/form": { - "version": "file:../../feature/form", + "@ohos/bigfolder": { + "version": "file:../../feature/bigfolder", "requires": { "@ohos/common": "file:../../common" }, @@ -63,8 +48,8 @@ } } }, - "@ohos/gesturenavigation": { - "version": "file:../../feature/gesturenavigation", + "@ohos/bluetoothcomponent": { + "version": "file:../../feature/systemui/bluetoothcomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -74,8 +59,8 @@ } } }, - "@ohos/noticeitem": { - "version": "file:../../feature/systemui/noticeitem", + "@ohos/brightnesscomponent": { + "version": "file:../../feature/systemui/brightnesscomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -85,8 +70,8 @@ } } }, - "@ohos/numbadge": { - "version": "file:../../feature/numbadge", + "@ohos/clockcomponent": { + "version": "file:../../feature/systemui/clockcomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -96,58 +81,20 @@ } } }, - "@ohos/pagedesktop": { - "version": "file:../../feature/pagedesktop", - "requires": { - "@ohos/bigfolder": "file:../../feature/bigfolder", - "@ohos/common": "file:../../common", - "@ohos/form": "file:../../feature/form" - }, - "dependencies": { - "@ohos/bigfolder": { - "version": "file:../../feature/bigfolder", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/common": { - "version": "file:../../common" - }, - "@ohos/form": { - "version": "file:../../feature/form", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - } - } + "@ohos/common": { + "version": "file:../../common" }, - "@ohos/phone_dropdownpanel": { - "version": "file:../../feature/systemui/phone/dropdownpanel", + "@ohos/controlcentercomponent": { + "version": "file:../../feature/systemui/controlcentercomponent", "requires": { "@ohos/airplanecomponent": "file:../../feature/systemui/airplanecomponent", "@ohos/autorotatecomponent": "file:../../feature/systemui/autorotatecomponent", - "@ohos/batterycomponent": "file:../../feature/systemui/batterycomponent", "@ohos/bluetoothcomponent": "file:../../feature/systemui/bluetoothcomponent", "@ohos/brightnesscomponent": "file:../../feature/systemui/brightnesscomponent", - "@ohos/clockcomponent": "file:../../feature/systemui/clockcomponent", "@ohos/common": "file:../../common", - "@ohos/controlcentercomponent": "file:../../feature/systemui/controlcentercomponent", "@ohos/locationcomponent": "file:../../feature/systemui/locationcomponent", "@ohos/nfccomponent": "file:../../feature/systemui/nfccomponent", - "@ohos/noticeitem": "file:../../feature/systemui/noticeitem", "@ohos/ringmodecomponent": "file:../../feature/systemui/ringmodecomponent", - "@ohos/signalcomponent": "file:../../feature/systemui/signalcomponent", - "@ohos/statusbarcomponent": "file:../../feature/systemui/statusbarcomponent", "@ohos/wificomponent": "file:../../feature/systemui/wificomponent" }, "dependencies": { @@ -173,8 +120,8 @@ } } }, - "@ohos/batterycomponent": { - "version": "file:../../feature/systemui/batterycomponent", + "@ohos/bluetoothcomponent": { + "version": "file:../../feature/systemui/bluetoothcomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -184,8 +131,8 @@ } } }, - "@ohos/bluetoothcomponent": { - "version": "file:../../feature/systemui/bluetoothcomponent", + "@ohos/brightnesscomponent": { + "version": "file:../../feature/systemui/brightnesscomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -195,8 +142,11 @@ } } }, - "@ohos/brightnesscomponent": { - "version": "file:../../feature/systemui/brightnesscomponent", + "@ohos/common": { + "version": "file:../../common" + }, + "@ohos/locationcomponent": { + "version": "file:../../feature/systemui/locationcomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -206,8 +156,8 @@ } } }, - "@ohos/clockcomponent": { - "version": "file:../../feature/systemui/clockcomponent", + "@ohos/nfccomponent": { + "version": "file:../../feature/systemui/nfccomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -217,118 +167,19 @@ } } }, - "@ohos/common": { - "version": "file:../../common" - }, - "@ohos/controlcentercomponent": { - "version": "file:../../feature/systemui/controlcentercomponent", + "@ohos/ringmodecomponent": { + "version": "file:../../feature/systemui/ringmodecomponent", "requires": { - "@ohos/airplanecomponent": "file:../../feature/systemui/airplanecomponent", - "@ohos/autorotatecomponent": "file:../../feature/systemui/autorotatecomponent", - "@ohos/bluetoothcomponent": "file:../../feature/systemui/bluetoothcomponent", - "@ohos/brightnesscomponent": "file:../../feature/systemui/brightnesscomponent", - "@ohos/common": "file:../../common", - "@ohos/locationcomponent": "file:../../feature/systemui/locationcomponent", - "@ohos/nfccomponent": "file:../../feature/systemui/nfccomponent", - "@ohos/ringmodecomponent": "file:../../feature/systemui/ringmodecomponent", - "@ohos/wificomponent": "file:../../feature/systemui/wificomponent" + "@ohos/common": "file:../../common" }, "dependencies": { - "@ohos/airplanecomponent": { - "version": "file:../../feature/systemui/airplanecomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/autorotatecomponent": { - "version": "file:../../feature/systemui/autorotatecomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/bluetoothcomponent": { - "version": "file:../../feature/systemui/bluetoothcomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/brightnesscomponent": { - "version": "file:../../feature/systemui/brightnesscomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, "@ohos/common": { "version": "file:../../common" - }, - "@ohos/locationcomponent": { - "version": "file:../../feature/systemui/locationcomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/nfccomponent": { - "version": "file:../../feature/systemui/nfccomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/ringmodecomponent": { - "version": "file:../../feature/systemui/ringmodecomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/wificomponent": { - "version": "file:../../feature/systemui/wificomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } } } }, - "@ohos/locationcomponent": { - "version": "file:../../feature/systemui/locationcomponent", + "@ohos/wificomponent": { + "version": "file:../../feature/systemui/wificomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -337,9 +188,32 @@ "version": "file:../../common" } } + } + } + }, + "@ohos/datetimecomponent": { + "version": "file:../../feature/systemui/datetimecomponent", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/default_volumepanel": { + "version": "file:../../feature/systemui/volumepanel", + "requires": { + "@ohos/common": "file:../../common", + "@ohos/volumepanelcomponent": "file:../../feature/systemui/volumepanelcomponent" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" }, - "@ohos/nfccomponent": { - "version": "file:../../feature/systemui/nfccomponent", + "@ohos/volumepanelcomponent": { + "version": "file:../../feature/systemui/volumepanelcomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -348,9 +222,85 @@ "version": "file:../../common" } } - }, - "@ohos/noticeitem": { - "version": "file:../../feature/systemui/noticeitem", + } + } + }, + "@ohos/form": { + "version": "file:../../feature/form", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/gesturenavigation": { + "version": "file:../../feature/gesturenavigation", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/locationcomponent": { + "version": "file:../../feature/systemui/locationcomponent", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/nfccomponent": { + "version": "file:../../feature/systemui/nfccomponent", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/noticeitem": { + "version": "file:../../feature/systemui/noticeitem", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/numbadge": { + "version": "file:../../feature/numbadge", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/pagedesktop": { + "version": "file:../../feature/pagedesktop", + "requires": { + "@ohos/bigfolder": "file:../../feature/bigfolder", + "@ohos/common": "file:../../common", + "@ohos/form": "file:../../feature/form" + }, + "dependencies": { + "@ohos/bigfolder": { + "version": "file:../../feature/bigfolder", "requires": { "@ohos/common": "file:../../common" }, @@ -360,8 +310,56 @@ } } }, - "@ohos/ringmodecomponent": { - "version": "file:../../feature/systemui/ringmodecomponent", + "@ohos/common": { + "version": "file:../../common" + }, + "@ohos/form": { + "version": "file:../../feature/form", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + } + } + }, + "@ohos/recents": { + "version": "file:../../feature/recents", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/ringmodecomponent": { + "version": "file:../../feature/systemui/ringmodecomponent", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/screenlock": { + "version": "file:../../feature/systemui/screenlock", + "requires": { + "@ohos/batterycomponent": "file:../../feature/systemui/batterycomponent", + "@ohos/clockcomponent": "file:../../feature/systemui/clockcomponent", + "@ohos/common": "file:../../common", + "@ohos/signalcomponent": "file:../../feature/systemui/signalcomponent", + "@ohos/wificomponent": "file:../../feature/systemui/wificomponent" + }, + "dependencies": { + "@ohos/batterycomponent": { + "version": "file:../../feature/systemui/batterycomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -371,8 +369,8 @@ } } }, - "@ohos/signalcomponent": { - "version": "file:../../feature/systemui/signalcomponent", + "@ohos/clockcomponent": { + "version": "file:../../feature/systemui/clockcomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -382,122 +380,17 @@ } } }, - "@ohos/statusbarcomponent": { - "version": "file:../../feature/systemui/statusbarcomponent", + "@ohos/common": { + "version": "file:../../common" + }, + "@ohos/signalcomponent": { + "version": "file:../../feature/systemui/signalcomponent", "requires": { - "@ohos/batterycomponent": "file:../../feature/systemui/batterycomponent", - "@ohos/bluetoothcomponent": "file:../../feature/systemui/bluetoothcomponent", - "@ohos/capsulecomponent": "file:../../feature/systemui/capsulecomponent", - "@ohos/clockcomponent": "file:../../feature/systemui/clockcomponent", - "@ohos/common": "file:../../common", - "@ohos/locationcomponent": "file:../../feature/systemui/locationcomponent", - "@ohos/nfccomponent": "file:../../feature/systemui/nfccomponent", - "@ohos/ringmodecomponent": "file:../../feature/systemui/ringmodecomponent", - "@ohos/signalcomponent": "file:../../feature/systemui/signalcomponent", - "@ohos/wificomponent": "file:../../feature/systemui/wificomponent" + "@ohos/common": "file:../../common" }, "dependencies": { - "@ohos/batterycomponent": { - "version": "file:../../feature/systemui/batterycomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/bluetoothcomponent": { - "version": "file:../../feature/systemui/bluetoothcomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/capsulecomponent": { - "version": "file:../../feature/systemui/capsulecomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/clockcomponent": { - "version": "file:../../feature/systemui/clockcomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, "@ohos/common": { "version": "file:../../common" - }, - "@ohos/locationcomponent": { - "version": "file:../../feature/systemui/locationcomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/nfccomponent": { - "version": "file:../../feature/systemui/nfccomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/ringmodecomponent": { - "version": "file:../../feature/systemui/ringmodecomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/signalcomponent": { - "version": "file:../../feature/systemui/signalcomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } - }, - "@ohos/wificomponent": { - "version": "file:../../feature/systemui/wificomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": { - "@ohos/common": { - "version": "file:../../common" - } - } } } }, @@ -514,103 +407,19 @@ } } }, - "@ohos/phone_statusbar": { - "version": "file:../../feature/systemui/phone/statusbar", + "@ohos/signalcomponent": { + "version": "file:../../feature/systemui/signalcomponent", "requires": { - "@ohos/common": "file:../../common", - "@ohos/statusbarcomponent": "file:../../feature/systemui/statusbarcomponent" + "@ohos/common": "file:../../common" }, "dependencies": { "@ohos/common": { "version": "file:../../common" - }, - "@ohos/statusbarcomponent": { - "version": "file:../../feature/systemui/statusbarcomponent", - "requires": { - "@ohos/batterycomponent": "file:../../feature/systemui/batterycomponent", - "@ohos/bluetoothcomponent": "file:../../feature/systemui/bluetoothcomponent", - "@ohos/capsulecomponent": "file:../../feature/systemui/capsulecomponent", - "@ohos/clockcomponent": "file:../../feature/systemui/clockcomponent", - "@ohos/common": "file:../../common", - "@ohos/locationcomponent": "file:../../feature/systemui/locationcomponent", - "@ohos/nfccomponent": "file:../../feature/systemui/nfccomponent", - "@ohos/ringmodecomponent": "file:../../feature/systemui/ringmodecomponent", - "@ohos/signalcomponent": "file:../../feature/systemui/signalcomponent", - "@ohos/wificomponent": "file:../../feature/systemui/wificomponent" - }, - "dependencies": { - "@ohos/batterycomponent": { - "version": "file:../../feature/systemui/batterycomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": {} - }, - "@ohos/bluetoothcomponent": { - "version": "file:../../feature/systemui/bluetoothcomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": {} - }, - "@ohos/capsulecomponent": { - "version": "file:../../feature/systemui/capsulecomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": {} - }, - "@ohos/clockcomponent": { - "version": "file:../../feature/systemui/clockcomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": {} - }, - "@ohos/common": { - "version": "file:../../common" - }, - "@ohos/locationcomponent": { - "version": "file:../../feature/systemui/locationcomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": {} - }, - "@ohos/nfccomponent": { - "version": "file:../../feature/systemui/nfccomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": {} - }, - "@ohos/ringmodecomponent": { - "version": "file:../../feature/systemui/ringmodecomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": {} - }, - "@ohos/signalcomponent": { - "version": "file:../../feature/systemui/signalcomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": {} - }, - "@ohos/wificomponent": { - "version": "file:../../feature/systemui/wificomponent", - "requires": { - "@ohos/common": "file:../../common" - }, - "dependencies": {} - } - } } } }, - "@ohos/recents": { - "version": "file:../../feature/recents", + "@ohos/smartdock": { + "version": "file:../../feature/smartdock", "requires": { "@ohos/common": "file:../../common" }, @@ -620,12 +429,17 @@ } } }, - "@ohos/screenlock": { - "version": "file:../../feature/systemui/screenlock", + "@ohos/statusbarcomponent": { + "version": "file:../../feature/systemui/statusbarcomponent", "requires": { "@ohos/batterycomponent": "file:../../feature/systemui/batterycomponent", + "@ohos/bluetoothcomponent": "file:../../feature/systemui/bluetoothcomponent", + "@ohos/capsulecomponent": "file:../../feature/systemui/capsulecomponent", "@ohos/clockcomponent": "file:../../feature/systemui/clockcomponent", "@ohos/common": "file:../../common", + "@ohos/locationcomponent": "file:../../feature/systemui/locationcomponent", + "@ohos/nfccomponent": "file:../../feature/systemui/nfccomponent", + "@ohos/ringmodecomponent": "file:../../feature/systemui/ringmodecomponent", "@ohos/signalcomponent": "file:../../feature/systemui/signalcomponent", "@ohos/wificomponent": "file:../../feature/systemui/wificomponent" }, @@ -641,6 +455,28 @@ } } }, + "@ohos/bluetoothcomponent": { + "version": "file:../../feature/systemui/bluetoothcomponent", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/capsulecomponent": { + "version": "file:../../feature/systemui/capsulecomponent", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, "@ohos/clockcomponent": { "version": "file:../../feature/systemui/clockcomponent", "requires": { @@ -655,6 +491,39 @@ "@ohos/common": { "version": "file:../../common" }, + "@ohos/locationcomponent": { + "version": "file:../../feature/systemui/locationcomponent", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/nfccomponent": { + "version": "file:../../feature/systemui/nfccomponent", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, + "@ohos/ringmodecomponent": { + "version": "file:../../feature/systemui/ringmodecomponent", + "requires": { + "@ohos/common": "file:../../common" + }, + "dependencies": { + "@ohos/common": { + "version": "file:../../common" + } + } + }, "@ohos/signalcomponent": { "version": "file:../../feature/systemui/signalcomponent", "requires": { @@ -679,8 +548,8 @@ } } }, - "@ohos/smartdock": { - "version": "file:../../feature/smartdock", + "@ohos/wallpapercomponent": { + "version": "file:../../feature/systemui/wallpapercomponent", "requires": { "@ohos/common": "file:../../common" }, @@ -690,8 +559,8 @@ } } }, - "@ohos/wallpapercomponent": { - "version": "file:../../feature/systemui/wallpapercomponent", + "@ohos/wificomponent": { + "version": "file:../../feature/systemui/wificomponent", "requires": { "@ohos/common": "file:../../common" }, diff --git a/product/phone/package.json b/product/phone/package.json index 09183bb0..a86f43aa 100644 --- a/product/phone/package.json +++ b/product/phone/package.json @@ -16,8 +16,19 @@ "@ohos/gesturenavigation": "../../feature/gesturenavigation", "@ohos/common": "../../common", "@ohos/numbadge": "../../feature/numbadge", - "@ohos/phone_statusbar": "../../feature/systemui/phone/statusbar", - "@ohos/phone_dropdownpanel": "../../feature/systemui/phone/dropdownpanel", + "@ohos/statusbarcomponent": "../../feature/systemui/statusbarcomponent", + "@ohos/wificomponent": "../../feature/systemui/wificomponent", + "@ohos/bluetoothcomponent": "../../feature/systemui/bluetoothcomponent", + "@ohos/signalcomponent": "../../feature/systemui/signalcomponent", + "@ohos/clockcomponent": "../../feature/systemui/clockcomponent", + "@ohos/locationcomponent": "../../feature/systemui/locationcomponent", + "@ohos/batterycomponent": "../../feature/systemui/batterycomponent", + "@ohos/controlcentercomponent": "../../feature/systemui/controlcentercomponent", + "@ohos/ringmodecomponent": "../../feature/systemui/ringmodecomponent", + "@ohos/autorotatecomponent": "../../feature/systemui/autorotatecomponent", + "@ohos/airplanecomponent": "../../feature/systemui/airplanecomponent", + "@ohos/brightnesscomponent": "../../feature/systemui/brightnesscomponent", + "@ohos/nfccomponent": "../../feature/systemui/nfccomponent", "@ohos/default_volumepanel": "../../feature/systemui/volumepanel", "@ohos/screenlock": "../../feature/systemui/screenlock", "@ohos/noticeitem": "../../feature/systemui/noticeitem", diff --git a/product/phone/src/main/ets/WindowScene/HWScreen.ets b/product/phone/src/main/ets/WindowScene/HWScreen.ets index 976122fa..eac8d13b 100644 --- a/product/phone/src/main/ets/WindowScene/HWScreen.ets +++ b/product/phone/src/main/ets/WindowScene/HWScreen.ets @@ -13,16 +13,31 @@ * limitations under the License. */ -import { HWScenePanel } from './HWScenePanel' -import { HWScreenSession } from '@ohos/common' -import { HWDesktop } from './HWDesktop' -import { HWWallpaper } from './HWWallpaper' -import { HWSystemUi } from './HWSystemUi' -import { SCBScreenLock } from '../screenlock/pages/SCBScreenLock' +import { HWScenePanel } from './HWScenePanel'; +import { HWScreenSession } from '@ohos/common'; +import { HWDesktop } from './HWDesktop'; +import { HWWallpaper } from './HWWallpaper'; +import { SCBStatusBar } from './statusbar/SCBStatusBar'; +import { DropdownPanel } from './dropdownpanel/DropdownPanel'; +import { BannerNotificationPanel } from './dropdownpanel/bannerNotification'; +import { SCBVolumePanel } from '@ohos/default_volumepanel/src/main/ets/pages/SCBVolumePanel'; +import { SCBScreenLock } from './screenlock/pages/SCBScreenLock'; +import WindowPanelManager, { + WindowInfo, + WindowType, + SystemUi_DropdownPanel, + SystemUi_BannerNotice, + SystemUi_VolumePanel +} from '@ohos/common/src/main/ets/default/manager/WindowPanelManager'; + +const MODULE_NAME = "phone-launcher"; @Component export struct HWScreen { - @ObjectLink screenSession: HWScreenSession + @ObjectLink screenSession: HWScreenSession; + @StorageLink(SystemUi_DropdownPanel) mDropDownInfo: WindowInfo = WindowPanelManager.getWindowInfo(WindowType.DROPDOWN_PANEL); + @StorageLink(SystemUi_BannerNotice) mBannerInfo: WindowInfo = WindowPanelManager.getWindowInfo(WindowType.BANNER_NOTICE); + @StorageLink(SystemUi_VolumePanel) mVolumeInfo: WindowInfo = WindowPanelManager.getWindowInfo(WindowType.VOLUME_PANEL); build() { Screen(this.screenSession.session.screenId) { @@ -38,8 +53,28 @@ export struct HWScreen { recentViewParam: this.screenSession.recentViewParam }) - // Systemui - HWSystemUi({ bounds: this.screenSession.bounds }) + // status bar + SCBStatusBar({bounds : this.screenSession.bounds, moduleName: MODULE_NAME}) + .position({x: 0, y: 0}) + .hitTestBehavior(HitTestMode.Transparent) + + // dropdown panel + DropdownPanel({bounds : this.screenSession.bounds, moduleName: MODULE_NAME}) + .visibility(this.mDropDownInfo.visibility ? Visibility.Visible : Visibility.Hidden) + + // BannerNotification + BannerNotificationPanel({bounds : this.screenSession.bounds}) + .width(this.mBannerInfo.rect.width + 'px') + .height(this.mBannerInfo.rect.height + 'px') + .position({x: this.mBannerInfo.rect.left + 'px', y: this.mBannerInfo.rect.top + 'px'}) + .visibility(this.mBannerInfo.visibility ? Visibility.Visible : Visibility.Hidden) + + // volume + SCBVolumePanel({bounds : this.screenSession.bounds}) + .width(this.mVolumeInfo.rect.width + 'px') + .height(this.mVolumeInfo.rect.height + 'px') + .position({x: this.mVolumeInfo.rect.left + 'px', y: this.mVolumeInfo.rect.top + 'px'}) + .visibility(this.mVolumeInfo.visibility ? Visibility.Visible : Visibility.Hidden) // screenlock SCBScreenLock({ bounds: this.screenSession.bounds }) diff --git a/product/phone/src/main/ets/WindowScene/HWSystemUi.ets b/product/phone/src/main/ets/WindowScene/HWSystemUi.ets deleted file mode 100644 index 72e53fda..00000000 --- a/product/phone/src/main/ets/WindowScene/HWSystemUi.ets +++ /dev/null @@ -1,61 +0,0 @@ -import AbilityManager from '../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; -/* - * Copyright (c) 2023 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 { Log } from '@ohos/common'; -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'; -import { SCBVolumePanel } from '@ohos/default_volumepanel/src/main/ets/pages/SCBVolumePanel'; - -const TAG = "HWSystemUi"; -const MODULE_NAME = "phone-launcher"; - -@Component -export struct HWSystemUi { - public bounds: screenSessionManager.RRect - - onBackPress(): boolean { - return true; - } - - aboutToAppear() { - Log.showInfo(TAG, `aboutToAppear, ${this.bounds.width}, ${this.bounds.height}`); - // 原来在StatusBar/DropdownPanel等处setAbilityPageName会相互覆盖，导致Style不对 - CommonStyleManager.setAbilityPageName(TAG) - } - - aboutToDisappear() { - Log.showInfo(TAG, `aboutToDisappear`); - } - - build() { - Stack() { - // status bar - SCBStatusBar({bounds : this.bounds, moduleName: MODULE_NAME}) - - // dropdown panel - SCBDropdownPanel({bounds : this.bounds, moduleName: MODULE_NAME}) - .hitTestBehavior(HitTestMode.Transparent) - - // volume - SCBVolumePanel({bounds : this.bounds}) - } - .hitTestBehavior(HitTestMode.Transparent) - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/DropdownPanel.ets b/product/phone/src/main/ets/WindowScene/dropdownpanel/DropdownPanel.ets similarity index 71% rename from feature/systemui/phone/dropdownpanel/src/main/ets/pages/DropdownPanel.ets rename to product/phone/src/main/ets/WindowScene/dropdownpanel/DropdownPanel.ets index 5ce8e089..150bb5d5 100644 --- a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/DropdownPanel.ets +++ b/product/phone/src/main/ets/WindowScene/dropdownpanel/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/utils/Trace' -import WindowPanelManager, { WindowType } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager' +import { Trace } from '@ohos/common/src/main/ets/default/utils/Trace' +import WindowPanelManager, { WindowInfo, WindowType, SystemUi_DropdownPanel } 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/layoutconfig/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/Constants"; +import screenSessionManager from '@ohos.screenSessionManager' const TAG = 'DropdownPanel' @@ -60,6 +60,7 @@ class insertTemplate{ @Component export struct DropdownPanel { + public bounds: screenSessionManager.RRect @State showComponentName: string = undefined; @State componentOptAreaHeightPX: number = 0; @StorageLink('StatusCoefficient') StatusCoefficient: number = 1.0; @@ -79,6 +80,7 @@ export struct DropdownPanel { @State componentOptAreaTranslateY: string = '0px'; @State backgroundOpacity: number = 0; private moduleName: string = '' + @StorageLink(SystemUi_DropdownPanel) mDropDownInfo: WindowInfo = WindowPanelManager.getWindowInfo(WindowType.DROPDOWN_PANEL); onBackPress(): boolean { return true @@ -86,16 +88,18 @@ export struct DropdownPanel { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear, start`); + AbilityManager.setContext(AbilityManager.ABILITY_NAME_DROPDOWN_PANEL, getContext(this)); - setAppBgColor('#00000000'); + let dropdownRect = { + left: 0, + top: 0, + width: this.bounds.width, + height: this.bounds.height, + }; + AbilityManager.setAbilityData(AbilityManager.ABILITY_NAME_DROPDOWN_PANEL, 'rect', dropdownRect); StyleManager.setStyle(); - // TODO 导航栏 - let dropdownRect = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_DROPDOWN_PANEL, 'rect'); this.componentOptAreaHeightPX = dropdownRect.height; -// let navigationBarRect = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_NAVIGATION_BAR, 'config'); -// this.initHelper(dropdownRect, navigationBarRect); -// this.resizeDropdownPanelAndNavigationBar(dropdownRect, navigationBarRect); Log.showDebug(TAG, `getValueSync componentOptAreaHeightPX: ${this.componentOptAreaHeightPX}`); this.componentOptAreaTranslateY = (-this.componentOptAreaHeightPX * 0.1) + 'px'; @@ -126,16 +130,6 @@ export struct DropdownPanel { Log.showDebug(TAG, `aboutToAppear, end`); } - private async initHelper(dropdownRect, navigationBarRect): Promise { - this.urivar = Constants.getUriSync(Constants.KEY_NAVIGATIONBAR_STATUS); - this.helper = await dataShare.createDataShareHelper(AbilityManager.getContext(AbilityManager.ABILITY_NAME_DROPDOWN_PANEL), this.urivar); - Log.showDebug(TAG, `initHelper ${this.helper}, uri: ${JSON.stringify(this.urivar)}`); - this.helper?.on("dataChange", this.urivar, () => { - this.resizeDropdownPanelAndNavigationBar(dropdownRect, navigationBarRect); - Log.showInfo(TAG, `NavigationBar status change, componentOptAreaHeightPX: ${this.componentOptAreaHeightPX}`); - }); - } - onPageShow() { Log.showInfo(TAG, `onPageShow, start`) if (!this.showComponentName) { @@ -154,16 +148,6 @@ export struct DropdownPanel { this.mClearCallbacks = undefined } - resizeDropdownPanelAndNavigationBar(dropdownRect, navigationBarRect) { - Log.showDebug(TAG, `resizeDropdownPanelAndNavigationBar, dropdownRect: ${JSON.stringify(dropdownRect)} navigationBarRect: ${JSON.stringify(navigationBarRect)}`) -// let context = AbilityManager.getContext(AbilityManager.ABILITY_NAME_DROPDOWN_PANEL); -// this.mNavigationBarStatusDefaultValue = settings.getValueSync(context, this.settingDataKey, '1'); -// this.componentOptAreaHeightPX = this.mNavigationBarStatusDefaultValue == '1' ? dropdownRect.height - navigationBarRect.realHeight : dropdownRect.height; -// this.navigationBarWidth = this.mNavigationBarStatusDefaultValue == '1' ? navigationBarRect.height : 0; -// WindowManager.resetSizeWindow(WindowType.NAVIGATION_BAR, { ...navigationBarRect, height: this.navigationBarWidth }) -// WindowManager.resetSizeWindow(WindowType.DROPDOWN_PANEL, { ...dropdownRect, height: this.componentOptAreaHeightPX }) - } - onNotificationShowOrHide(data) { Log.showDebug(TAG, `mNotificationAsyncCallback preKeys: ${data.preKeys}, finalKey: ${data.finalKey}`); Log.showDebug(TAG, `this.showComponentName: ${this.showComponentName}`); @@ -271,46 +255,48 @@ export struct DropdownPanel { } build() { - Stack({ alignContent: Alignment.Top }) { - Image($r("app.media.dropdownpanel_bgc")) - .width('100%') - .height('100%') - .objectFit(ImageFit.Fill) - .blur(25) - .opacity(this.backgroundOpacity) - Column() { - if (this.showComponentName == 'Notification') { - Column() { - Notification({ touchMoveCallback: (data) => this.onTouchMove(data) }) - } + if (this.mDropDownInfo.visibility) { + Stack({ alignContent: Alignment.Top }) { + Image($r("app.media.dropdownpanel_bgc")) .width('100%') .height('100%') - .transition(this.mNotificationInsert) - .transition(this.mNotificationDelete) - } else if (this.showComponentName == 'ControlCenter') { - Column() { - ControlCenterComponent({ - touchMoveCallback: (data) => this.onTouchMove(data), - moduleName: this.moduleName - }) + .objectFit(ImageFit.Fill) + .blur(25) + .opacity(this.backgroundOpacity) + Column() { + if (this.showComponentName == 'Notification') { + Column() { + Notification({ touchMoveCallback: (data) => this.onTouchMove(data) }) + } + .width('100%') + .height('100%') + .transition(this.mNotificationInsert) + .transition(this.mNotificationDelete) + } else if (this.showComponentName == 'ControlCenter') { + Column() { + ControlCenterComponent({ + touchMoveCallback: (data) => this.onTouchMove(data), + moduleName: this.moduleName + }) + } + .width('100%') + .height('100%') + .transition(this.mControlCenterInsert) + .transition(this.mControlCenterDelete) } - .width('100%') - .height('100%') - .transition(this.mControlCenterInsert) - .transition(this.mControlCenterDelete) } + .width('100%') + .height(this.componentOptAreaHeightPX + 'px') + .translate({ y: this.componentOptAreaTranslateY }) } .width('100%') - .height(this.componentOptAreaHeightPX + 'px') - .translate({ y: this.componentOptAreaTranslateY }) + .height('100%') + .backgroundColor($r("app.color.default_background")) + .opacity(this.backgroundOpacity) + .onAreaChange((e, e2) => { + Log.showInfo(TAG, `onAreaChange, e: ${JSON.stringify(e)} e2: ${JSON.stringify(e2)}`); + this.mWidthPx = vp2px(Number(e2.width)) + }) } - .width('100%') - .height('100%') - .backgroundColor($r("app.color.default_background")) - .opacity(this.backgroundOpacity) - .onAreaChange((e, e2) => { - Log.showInfo(TAG, `onAreaChange, e: ${JSON.stringify(e)} e2: ${JSON.stringify(e2)}`); - this.mWidthPx = vp2px(Number(e2.width)) - }) } } diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets b/product/phone/src/main/ets/WindowScene/dropdownpanel/bannerNotification.ets similarity index 94% rename from feature/systemui/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets rename to product/phone/src/main/ets/WindowScene/dropdownpanel/bannerNotification.ets index b059644d..fc493418 100644 --- a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets +++ b/product/phone/src/main/ets/WindowScene/dropdownpanel/bannerNotification.ets @@ -21,6 +21,7 @@ import EventManager, {unsubscribe} from "@ohos/common/src/main/ets/default/utils 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'; +import screenSessionManager from '@ohos.screenSessionManager' const TAG = 'DropdownPanel-BannerNotification'; const TRANSLATE_SIZE = '382vp'; @@ -51,6 +52,7 @@ const OPACITY_HIDE_ANIM_CONFIG = { @Component export struct BannerNotificationPanel { + public bounds: screenSessionManager.RRect @State distributedDeviceName: string = ''; @State mBannerNoticeCnt: number = 0; @State mLastActionTime: number = 0; @@ -63,7 +65,7 @@ export struct BannerNotificationPanel { @StorageLink(SystemUi_BannerNotice) @Watch('bannerChange') mBannerInfo: WindowInfo = WindowPanelManager.getWindowInfo(WindowType.BANNER_NOTICE); mClearCallbacks: unsubscribe[] - mDefaultBannerRect: any; + mDefaultBannerRect = { left: 0, top: 0, width: 0, height: 0 }; bannerChange() { Log.showInfo(TAG, `bannerChange ${JSON.stringify(this.mBannerInfo)}`) @@ -72,7 +74,13 @@ export struct BannerNotificationPanel { aboutToAppear() { Log.showInfo(TAG, `aboutToAppear Start`); AbilityManager.setContextName(AbilityManager.ABILITY_NAME_NOTIFICATION_PANEL,AbilityManager.ABILITY_NAME_DROPDOWN_PANEL); - setAppBgColor('#00000000') + let bannerRect = { + left: 0, + top: this.bounds.height / 5, + width: this.bounds.width, + height: this.bounds.height / 20 + }; + AbilityManager.setAbilityData(AbilityManager.ABILITY_NAME_BANNER_NOTICE, 'bannerRect', bannerRect); this.mClearCallbacks = [] this.mClearCallbacks.push(EventManager.subscribe('onBannerNoticeShow', () => this.onBannerNoticeShow())) this.mClearCallbacks.push(EventManager.subscribe('onBannerNoticeHide', () => this.onBannerNoticeHide())) diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/ControlCenterConfig.ts b/product/phone/src/main/ets/WindowScene/dropdownpanel/common/ControlCenterConfig.ts similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/ControlCenterConfig.ts rename to product/phone/src/main/ets/WindowScene/dropdownpanel/common/ControlCenterConfig.ts diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleConfiguration.ts b/product/phone/src/main/ets/WindowScene/dropdownpanel/common/StyleConfiguration.ts similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleConfiguration.ts rename to product/phone/src/main/ets/WindowScene/dropdownpanel/common/StyleConfiguration.ts diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleManager.ts b/product/phone/src/main/ets/WindowScene/dropdownpanel/common/StyleManager.ts similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/StyleManager.ts rename to product/phone/src/main/ets/WindowScene/dropdownpanel/common/StyleManager.ts diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/constants.ts b/product/phone/src/main/ets/WindowScene/dropdownpanel/common/constants.ts similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/constants.ts rename to product/phone/src/main/ets/WindowScene/dropdownpanel/common/constants.ts diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/navigationEvent.ts b/product/phone/src/main/ets/WindowScene/dropdownpanel/common/navigationEvent.ts similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/ets/pages/common/navigationEvent.ts rename to product/phone/src/main/ets/WindowScene/dropdownpanel/common/navigationEvent.ts diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/control.ets b/product/phone/src/main/ets/WindowScene/dropdownpanel/control.ets similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/ets/pages/control.ets rename to product/phone/src/main/ets/WindowScene/dropdownpanel/control.ets diff --git a/feature/systemui/phone/dropdownpanel/src/main/ets/pages/notification.ets b/product/phone/src/main/ets/WindowScene/dropdownpanel/notification.ets similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/ets/pages/notification.ets rename to product/phone/src/main/ets/WindowScene/dropdownpanel/notification.ets diff --git a/product/phone/src/main/ets/screenlock/common/constants.ts b/product/phone/src/main/ets/WindowScene/screenlock/common/constants.ts similarity index 100% rename from product/phone/src/main/ets/screenlock/common/constants.ts rename to product/phone/src/main/ets/WindowScene/screenlock/common/constants.ts diff --git a/product/phone/src/main/ets/screenlock/pages/SCBScreenLock.ets b/product/phone/src/main/ets/WindowScene/screenlock/pages/SCBScreenLock.ets similarity index 95% rename from product/phone/src/main/ets/screenlock/pages/SCBScreenLock.ets rename to product/phone/src/main/ets/WindowScene/screenlock/pages/SCBScreenLock.ets index 94cf0f19..564023a6 100644 --- a/product/phone/src/main/ets/screenlock/pages/SCBScreenLock.ets +++ b/product/phone/src/main/ets/WindowScene/screenlock/pages/SCBScreenLock.ets @@ -14,7 +14,6 @@ */ 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' @@ -22,11 +21,11 @@ import SlideScreenLock from './slidescreenlock' import CustomScreenLock from './customscreenlock' 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/manager/TimeManager' import WindowPanelManager, { WindowType, WindowInfo, SystemUi_ScreenLock } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager'; import screenSessionManager from '@ohos.screenSessionManager'; +import ScreenLockService from '@ohos/screenlock/src/main/ets/com/ohos/model/screenLockService' const TAG = 'ScreenLock-Entry'; @@ -43,14 +42,13 @@ export struct SCBScreenLock { AbilityManager.setContext(AbilityManager.ABILITY_NAME_SCREEN_LOCK, getContext(this)); sTimeManager.init(getContext(this)); this.initStatusBarRect(); - this.mScreenLockInfo.visibility = true; + ScreenLockService.lockScreen(); this.mViewModel.ViewModelInit() this.pageStatus = Constants.STATUS_ABOUT_TO_APPEAR try { let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') Log.showDebug(TAG, `configMaxWidth${JSON.stringify(configInfo.height)}`) this.mHeightPx = configInfo.height - StyleManager.setStyle() this.pageStatus = Constants.STATUS_ABOUT_TO_APPEAR } catch (error) { Log.showError(TAG, `set status error:` + JSON.stringify(error)); diff --git a/product/phone/src/main/ets/screenlock/pages/customPassword.ets b/product/phone/src/main/ets/WindowScene/screenlock/pages/customPassword.ets similarity index 96% rename from product/phone/src/main/ets/screenlock/pages/customPassword.ets rename to product/phone/src/main/ets/WindowScene/screenlock/pages/customPassword.ets index 9f8de758..c0547be8 100644 --- a/product/phone/src/main/ets/screenlock/pages/customPassword.ets +++ b/product/phone/src/main/ets/WindowScene/screenlock/pages/customPassword.ets @@ -19,7 +19,6 @@ import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abi 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' import Constants from '../common/constants' -import StyleManager from '../common/StyleManager' const TAG = 'ScreenLock-CustomPassword' @@ -34,7 +33,6 @@ export default struct CustomPassword { let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') Log.showDebug(TAG, `configMaxWidth${JSON.stringify(configInfo.height)}`) this.mHeightPx = configInfo.height - StyleManager.setStyle() } aboutToDisappear() { diff --git a/product/phone/src/main/ets/screenlock/pages/customscreenlock.ets b/product/phone/src/main/ets/WindowScene/screenlock/pages/customscreenlock.ets similarity index 100% rename from product/phone/src/main/ets/screenlock/pages/customscreenlock.ets rename to product/phone/src/main/ets/WindowScene/screenlock/pages/customscreenlock.ets diff --git a/product/phone/src/main/ets/screenlock/pages/digitalPassword.ets b/product/phone/src/main/ets/WindowScene/screenlock/pages/digitalPassword.ets similarity index 96% rename from product/phone/src/main/ets/screenlock/pages/digitalPassword.ets rename to product/phone/src/main/ets/WindowScene/screenlock/pages/digitalPassword.ets index 88809cf0..77a79251 100644 --- a/product/phone/src/main/ets/screenlock/pages/digitalPassword.ets +++ b/product/phone/src/main/ets/WindowScene/screenlock/pages/digitalPassword.ets @@ -19,7 +19,6 @@ import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abi 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' import Constants from '../common/constants' -import StyleManager from '../common/StyleManager' const TAG = 'ScreenLock-DigitalPassword' @@ -34,7 +33,6 @@ export default struct DigitalPassword { let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') Log.showDebug(TAG, `configMaxWidth${JSON.stringify(configInfo.height)}`) this.mHeightPx = configInfo.height - StyleManager.setStyle() } aboutToDisappear() { diff --git a/product/phone/src/main/ets/screenlock/pages/journalscreenlock.ets b/product/phone/src/main/ets/WindowScene/screenlock/pages/journalscreenlock.ets similarity index 100% rename from product/phone/src/main/ets/screenlock/pages/journalscreenlock.ets rename to product/phone/src/main/ets/WindowScene/screenlock/pages/journalscreenlock.ets diff --git a/product/phone/src/main/ets/screenlock/pages/mixedPassword.ets b/product/phone/src/main/ets/WindowScene/screenlock/pages/mixedPassword.ets similarity index 96% rename from product/phone/src/main/ets/screenlock/pages/mixedPassword.ets rename to product/phone/src/main/ets/WindowScene/screenlock/pages/mixedPassword.ets index 6a96c0bf..77b82237 100644 --- a/product/phone/src/main/ets/screenlock/pages/mixedPassword.ets +++ b/product/phone/src/main/ets/WindowScene/screenlock/pages/mixedPassword.ets @@ -19,7 +19,6 @@ import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abi 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' import Constants from '../common/constants' -import StyleManager from '../common/StyleManager' const TAG = 'ScreenLock-MixedPassword' @@ -33,7 +32,6 @@ export default struct MixedPassword { let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') Log.showDebug(TAG, `configMaxWidth${JSON.stringify(configInfo.height)}`) this.mHeightPx = configInfo.height - StyleManager.setStyle() } aboutToDisappear() { diff --git a/product/phone/src/main/ets/screenlock/pages/slidescreenlock.ets b/product/phone/src/main/ets/WindowScene/screenlock/pages/slidescreenlock.ets similarity index 100% rename from product/phone/src/main/ets/screenlock/pages/slidescreenlock.ets rename to product/phone/src/main/ets/WindowScene/screenlock/pages/slidescreenlock.ets diff --git a/product/phone/src/main/ets/screenlock/vm/indexViewModel.ts b/product/phone/src/main/ets/WindowScene/screenlock/vm/indexViewModel.ts similarity index 100% rename from product/phone/src/main/ets/screenlock/vm/indexViewModel.ts rename to product/phone/src/main/ets/WindowScene/screenlock/vm/indexViewModel.ts diff --git a/product/phone/src/main/ets/screenlock/vm/slideScreenLockViewModel.ts b/product/phone/src/main/ets/WindowScene/screenlock/vm/slideScreenLockViewModel.ts similarity index 100% rename from product/phone/src/main/ets/screenlock/vm/slideScreenLockViewModel.ts rename to product/phone/src/main/ets/WindowScene/screenlock/vm/slideScreenLockViewModel.ts diff --git a/feature/systemui/phone/statusbar/src/main/ets/pages/SCBStatusBar.ets b/product/phone/src/main/ets/WindowScene/statusbar/SCBStatusBar.ets similarity index 100% rename from feature/systemui/phone/statusbar/src/main/ets/pages/SCBStatusBar.ets rename to product/phone/src/main/ets/WindowScene/statusbar/SCBStatusBar.ets diff --git a/feature/systemui/phone/statusbar/src/main/ets/pages/StatusBar.ets b/product/phone/src/main/ets/WindowScene/statusbar/StatusBar.ets similarity index 94% rename from feature/systemui/phone/statusbar/src/main/ets/pages/StatusBar.ets rename to product/phone/src/main/ets/WindowScene/statusbar/StatusBar.ets index a2e220cb..d79f7f6a 100644 --- a/feature/systemui/phone/statusbar/src/main/ets/pages/StatusBar.ets +++ b/product/phone/src/main/ets/WindowScene/statusbar/StatusBar.ets @@ -19,9 +19,7 @@ import { HeightConfigUtils } from '@ohos/common/src/main/ets/default/layoutconfi 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' -import Constants from './common/constants' -import StyleManager from './common/StyleManager' -import StatusbarConfig from './common/StatusbarConfig' +import StatusbarConfig from './StatusbarConfig' import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager' import { Trace, Log } from '@ohos/common'; import { WindowType, WINDOW_SHOW_HIDE_EVENT } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager' @@ -51,9 +49,6 @@ export struct StatusBar { Log.showInfo(TAG, `aboutToAppear, start`); this.updateStatusBarData(); - setAppBgColor('#00000000'); - StyleManager.setStyle(); - this.mClearCallback = EventManager.subscribe(WINDOW_SHOW_HIDE_EVENT, (args) => this.onWindowShowHideEvent(args)); mHeightConfigUtils = new HeightConfigUtils(); @@ -116,14 +111,14 @@ export struct StatusBar { touchEvent(event: TouchEvent) { Trace.start(Trace.CORE_METHOD_START_TOUCHEVENT); Log.showDebug(TAG, 'touchEvent' + event.touches) - if (event.type == Constants.TOUCHTYPE_DOWN) { //down + if (event.type == TouchType.Down) { //down this.startX = event.touches[0].screenX this.startY = event.touches[0].screenY Log.showInfo(TAG, `touchStart, startX: ${this.startX}, startY: ${this.startY}`) - } else if (event.type == Constants.TOUCHTYPE_MOVE) { //move + } else if (event.type == TouchType.Move) { //move this.moveX = event.touches[0].screenX - this.startX this.moveY = event.touches[0].screenY - this.startY - } else if (event.type == Constants.TOUCHTYPE_UP) { //up + } else if (event.type == TouchType.Up) { //up Log.showInfo(TAG, `touchEnd, moveX: ${this.moveX}, moveY: ${this.moveY}`) if (this.moveY > SLIDING_STATUS_BAR_DISTANCE) { this.onDropdown(); diff --git a/feature/systemui/phone/statusbar/src/main/ets/pages/common/StatusbarConfig.ts b/product/phone/src/main/ets/WindowScene/statusbar/StatusbarConfig.ts similarity index 100% rename from feature/systemui/phone/statusbar/src/main/ets/pages/common/StatusbarConfig.ts rename to product/phone/src/main/ets/WindowScene/statusbar/StatusbarConfig.ts diff --git a/product/phone/src/main/ets/pages/EntryView.ets b/product/phone/src/main/ets/pages/EntryView.ets index 25909b7f..ea0fa4e9 100644 --- a/product/phone/src/main/ets/pages/EntryView.ets +++ b/product/phone/src/main/ets/pages/EntryView.ets @@ -17,6 +17,10 @@ import { HWRootSceneSession } from '@ohos/common' import { HWSceneSessionManager } from '@ohos/common' import { HWScreen } from '../WindowScene/HWScreen' import { HWScreenSession } from '@ohos/common' +import { Log } from '@ohos/common'; +import CommonStyleManager from '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; + +const TAG = "EntryView"; @Entry @Component @@ -24,6 +28,18 @@ struct EntryView { @StorageLink('screenSessionList') screenSessionList: HWScreenSession[] = [] private rootSceneSession: HWRootSceneSession = HWSceneSessionManager.getInstance().getRootSceneSession() + + aboutToAppear() { + Log.showInfo(TAG, `aboutToAppear`); + + // 原来在StatusBar/DropdownPanel等处setAbilityPageName会相互覆盖，导致Style不对 + CommonStyleManager.setAbilityPageName(TAG); + } + + aboutToDisappear() { + Log.showInfo(TAG, `aboutToDisappear`); + } + build() { RootScene(this.rootSceneSession.session) { ForEach(this.screenSessionList, (item) => { diff --git a/product/phone/src/main/ets/screenlock/common/StyleConfiguration.ts b/product/phone/src/main/ets/screenlock/common/StyleConfiguration.ts deleted file mode 100644 index 27ff2a2b..00000000 --- a/product/phone/src/main/ets/screenlock/common/StyleConfiguration.ts +++ /dev/null @@ -1,30 +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 '@ohos/common/src/main/ets/default/manager/CommonStyleManager'; -import { Log } from '@ohos/common/src/main/ets/default/utils/Log'; - -const TAG = 'Lock_StatusBar-StyleConfiguration'; - -export class ScreenLockStyle { -} - -export default class StyleConfiguration { - static getIndexStyle() { - Log.showInfo(TAG, `setStyle`) - const key: string = TAG + "-Index"; - return CommonStyleManager.getStyle(key, ScreenLockStyle); - } -} \ No newline at end of file diff --git a/product/phone/src/main/ets/screenlock/common/StyleManager.ts b/product/phone/src/main/ets/screenlock/common/StyleManager.ts deleted file mode 100644 index e02ab999..00000000 --- a/product/phone/src/main/ets/screenlock/common/StyleManager.ts +++ /dev/null @@ -1,51 +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 { Log } from '@ohos/common/src/main/ets/default/utils/Log'; -import AbilityManager from '@ohos/common/src/main/ets/default/abilitymanager/abilityManager'; -import IndexStyleConfiguration from './StyleConfiguration' - -const TAG = 'StatusBar-StyleManager'; - -export default class StyleManager { - static STANDARD_DISPLAY_WIDTH: number = 720; - static STANDARD_DISPLAY_HEIGHT: number = 1280; - static maxWidth: number = StyleManager.STANDARD_DISPLAY_WIDTH; - - static setStyle() { - Log.showInfo(TAG, `setStyle`) - - let config = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'dis'); - StyleManager.maxWidth = config.maxWidth; - - // xxx - { - - } - - } - - static number2px(n: number): string { - return n.toString() + 'px'; - } - - static calcScaleSize(n: number): number { - return n * StyleManager.maxWidth / StyleManager.STANDARD_DISPLAY_WIDTH; - } - - static calcScaleSizePx(n: number): string { - return StyleManager.number2px(StyleManager.calcScaleSize(n)); - } -} \ No newline at end of file diff --git a/product/phone/src/main/resources/base/element/color.json b/product/phone/src/main/resources/base/element/color.json index b1a9a9db..a30a85f3 100644 --- a/product/phone/src/main/resources/base/element/color.json +++ b/product/phone/src/main/resources/base/element/color.json @@ -123,6 +123,58 @@ { "name": "screenlock_backgroundcolor", "value": "#000000" + }, + { + "name": "default_font_color", + "value": "#ffffffff" + }, + { + "name": "capsule_background_color", + "value": "#64BB5C" + }, + { + "name" : "green_capsule_text_color", + "value" : "#ccFFFFFF" + }, + { + "name": "background_color", + "value": "#DCDCDC" + }, + { + "name": "control_center_complex_toggle_ring_mode_on_bg_color", + "value": "#FFFF9800" + }, + { + "name": "default_background", + "value": "#999999" + }, + { + "name": "notification_delete_all_background", + "value": "#4C000000" + }, + { + "name": "quickly_setting_time_font_color", + "value": "#ffffffff" + }, + { + "name": "quickly_setting_date_font_color", + "value": "#ffffffff" + }, + { + "name": "statusbar_background_color", + "value": "#00ffff00" + }, + { + "name": "brightness_slider_block_color", + "value": "#FFFFFFFF" + }, + { + "name": "brightness_slider_track_color", + "value": "#1A000000" + }, + { + "name": "brightness_slider_selected_color", + "value": "#FF007DFF" } ] } \ No newline at end of file diff --git a/product/phone/src/main/resources/base/element/float.json b/product/phone/src/main/resources/base/element/float.json index bbe65086..87187b39 100644 --- a/product/phone/src/main/resources/base/element/float.json +++ b/product/phone/src/main/resources/base/element/float.json @@ -119,7 +119,198 @@ { "name": "accounts_area_height", "value": "80vp" - + }, + { + "name": "status_bar_clock_width", + "value": "37vp" + }, + { + "name": "green_capsule_phone_width", + "value": "14vp" + }, + { + "name": "green_capsule_phone_height", + "value": "14vp" + }, + { + "name": "green_capsule_height", + "value": "20vp" + }, + { + "name": "green_capsule_text_left_right", + "value": "6vp" + }, + { + "name": "green_capsule_radius", + "value": "10vp" + }, + { + "name": "status_bar_bluetooth_width", + "value": "11.5vp" + }, + { + "name": "status_bar_bluetooth_height", + "value": "15vp" + }, + { + "name": "status_bar_ring_mode_width", + "value": "17vp" + }, + { + "name": "status_bar_ring_mode_height", + "value": "15vp" + }, + { + "name": "status_bar_location_width", + "value": "13vp" + }, + { + "name": "status_bar_location_height", + "value": "15vp" + }, + { + "name": "icon_component_opacity", + "value": "0.7" + }, + { + "name": "mTime_text_margin_left", + "value": "2vp" + }, + { + "name": "signal_component_text_margin_left", + "value": "3vp" + }, + { + "name": "green_capsule_phone_text_left", + "value": "1vp" + }, + { + "name": "green_capsule_phone_margin_left", + "value": "2vp" + }, + { + "name": "battery_component_margin", + "value": "2vp" + }, + { + "name": "status_bar_margin_left_right", + "value": "5vp" + }, + { + "name": "status_bar_height", + "value": "46vp" + }, + { + "name": "phone_status_bar_height", + "value": "39vp" + }, + { + "name": "notification_delete_all", + "value": "32" + }, + { + "name": "quickly_setting_time_font_size", + "value": "30fp" + }, + { + "name": "quickly_setting_date_font_size", + "value": "20fp" + }, + { + "name": "quickly_setting_text_flex_margin_left", + "value": "10vp" + }, + { + "name": "quickly_setting_image_width", + "value": "50vp" + }, + { + "name": "quickly_setting_image_height", + "value": "50vp" + }, + { + "name": "quickly_setting_image_margin_right", + "value": "10vp" + }, + { + "name": "quickly_setting_border_radius", + "value": "20vp" + }, + { + "name": "quickly_setting_margin_left", + "value": "10vp" + }, + { + "name": "quickly_setting_margin_right", + "value": "10vp" + }, + { + "name": "delete_all_image_width", + "value": "50vp" + }, + { + "name": "delete_all_image_height", + "value": "50vp" + }, + { + "name": "delete_all_image_border_radius", + "value": "25vp" + }, + { + "name": "delete_all_image_opacity", + "value": "0.9" + }, + { + "name": "brightness_margin_left", + "value": "26vp" + }, + { + "name": "brightness_margin_right", + "value": "26vp" + }, + { + "name": "brightness_component_gap", + "value": "26vp" + }, + { + "name": "brightness_reduce_width", + "value": "44vp" + }, + { + "name": "brightness_reduce_height", + "value": "44vp" + }, + { + "name": "brightness_plus_width", + "value": "44vp" + }, + { + "name": "brightness_plus_height", + "value": "44vp" + }, + { + "name": "brightness_height", + "value": "44vp" + }, + { + "name": "brightness_slider_height", + "value": "40vp" + }, + { + "name": "status_bar_padding_left_right", + "value": "12vp" + }, + { + "name": "status_bar_padding_top_bottom", + "value": "4vp" + }, + { + "name": "notification_title_setting_icon_width", + "value": "48px" + }, + { + "name": "notification_title_setting_icon_height", + "value": "48px" } ] } \ No newline at end of file diff --git a/product/phone/src/main/resources/base/element/string.json b/product/phone/src/main/resources/base/element/string.json index 0123072d..97bf4ff9 100644 --- a/product/phone/src/main/resources/base/element/string.json +++ b/product/phone/src/main/resources/base/element/string.json @@ -171,6 +171,146 @@ { "name": "remove_app_from_folder", "value": "remove app from folder" + }, + { + "name": "status_bar_size_portrait", + "value": "36" + }, + { + "name": "status_bar_size_landscape", + "value": "36" + }, + { + "name": "phone_status_bar_size_portrait", + "value": "54" + }, + { + "name": "phone_status_bar_size_landscape", + "value": "54" + }, + { + "name": "status_bar_position_landscape", + "value": "2" + }, + { + "name": "status_bar_position_portrait", + "value": "2" + }, + { + "name": "net_null", + "value": "没有 SIM 卡" + }, + { + "name": "2G", + "value": "2G" + }, + { + "name": "3G", + "value": "3G" + }, + { + "name": "4G", + "value": "4G" + }, + { + "name": "5G", + "value": "5G" + }, + { + "name": "signal_null", + "value": "×" + }, + { + "name": "incoming_call", + "value": "来电" + }, + { + "name": "communicate_by_phone", + "value": "通话" + }, + { + "name": "monday", + "value": "星期一" + }, + { + "name": "tuesday", + "value": "星期二" + }, + { + "name": "wednesday", + "value": "星期三" + }, + { + "name": "thursday", + "value": "星期四" + }, + { + "name": "friday", + "value": "星期五" + }, + { + "name": "saturday", + "value": "星期六" + }, + { + "name": "sunday", + "value": "星期日" + }, + { + "name": "day", + "value": "日" + }, + { + "name": "month", + "value": "月" + }, + { + "name": "no_notification", + "value": "没有通知" + }, + { + "name": "airplane_mode", + "value": "飞行模式" + }, + { + "name": "control_center_complex_toggle_bluetooth_title", + "value": "蓝牙" + }, + { + "name": "control_center_complex_toggle_location_title", + "value": "位置信息" + }, + { + "name": "control_center_complex_toggle_ring_mode_title_on", + "value": "响铃" + }, + { + "name": "control_center_complex_toggle_ring_mode_title_off", + "value": "静音" + }, + { + "name": "control_center_complex_toggle_ring_mode_title_vibration", + "value": "振动" + }, + { + "name": "nav_bar_position_landscape", + "value": "4" + }, + { + "name": "nav_bar_size_landscape", + "value": "36" + }, + { + "name": "nav_bar_position_portrait", + "value": "4" + }, + { + "name": "nav_bar_size_portrait", + "value": "36" + }, + { + "name": "control_center_complex_toggle_nfc_mode_title", + "value": "NFC" } ] } \ No newline at end of file diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/airplane.svg b/product/phone/src/main/resources/base/media/airplane.svg similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/airplane.svg rename to product/phone/src/main/resources/base/media/airplane.svg diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/airplane_d.svg b/product/phone/src/main/resources/base/media/airplane_d.svg similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/airplane_d.svg rename to product/phone/src/main/resources/base/media/airplane_d.svg diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_brightness_plus.svg b/product/phone/src/main/resources/base/media/ic_brightness_plus.svg similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_brightness_plus.svg rename to product/phone/src/main/resources/base/media/ic_brightness_plus.svg diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_brightness_reduce.svg b/product/phone/src/main/resources/base/media/ic_brightness_reduce.svg similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_brightness_reduce.svg rename to product/phone/src/main/resources/base/media/ic_brightness_reduce.svg diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_controlcenter_bt.svg b/product/phone/src/main/resources/base/media/ic_controlcenter_bt.svg similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_controlcenter_bt.svg rename to product/phone/src/main/resources/base/media/ic_controlcenter_bt.svg diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_controlcenter_bt_d.svg b/product/phone/src/main/resources/base/media/ic_controlcenter_bt_d.svg similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_controlcenter_bt_d.svg rename to product/phone/src/main/resources/base/media/ic_controlcenter_bt_d.svg diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_controlcenter_gps.svg b/product/phone/src/main/resources/base/media/ic_controlcenter_gps.svg similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_controlcenter_gps.svg rename to product/phone/src/main/resources/base/media/ic_controlcenter_gps.svg diff --git a/feature/systemui/ringmodecomponent/src/main/resources/base/media/ic_controlcenter_ring_off_filled.svg b/product/phone/src/main/resources/base/media/ic_controlcenter_ring_off_filled.svg similarity index 100% rename from feature/systemui/ringmodecomponent/src/main/resources/base/media/ic_controlcenter_ring_off_filled.svg rename to product/phone/src/main/resources/base/media/ic_controlcenter_ring_off_filled.svg diff --git a/feature/systemui/ringmodecomponent/src/main/resources/base/media/ic_controlcenter_ring_on_filled.svg b/product/phone/src/main/resources/base/media/ic_controlcenter_ring_on_filled.svg similarity index 100% rename from feature/systemui/ringmodecomponent/src/main/resources/base/media/ic_controlcenter_ring_on_filled.svg rename to product/phone/src/main/resources/base/media/ic_controlcenter_ring_on_filled.svg diff --git a/feature/systemui/ringmodecomponent/src/main/resources/base/media/ic_controlcenter_vibration_filled.svg b/product/phone/src/main/resources/base/media/ic_controlcenter_vibration_filled.svg similarity index 100% rename from feature/systemui/ringmodecomponent/src/main/resources/base/media/ic_controlcenter_vibration_filled.svg rename to product/phone/src/main/resources/base/media/ic_controlcenter_vibration_filled.svg diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_notification_nfc.svg b/product/phone/src/main/resources/base/media/ic_notification_nfc.svg similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_notification_nfc.svg rename to product/phone/src/main/resources/base/media/ic_notification_nfc.svg diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_notification_nfc_filled.svg b/product/phone/src/main/resources/base/media/ic_notification_nfc_filled.svg similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_notification_nfc_filled.svg rename to product/phone/src/main/resources/base/media/ic_notification_nfc_filled.svg diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_public_delete.svg b/product/phone/src/main/resources/base/media/ic_public_delete.svg similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_public_delete.svg rename to product/phone/src/main/resources/base/media/ic_public_delete.svg diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_public_settings.svg b/product/phone/src/main/resources/base/media/ic_public_settings.svg similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_public_settings.svg rename to product/phone/src/main/resources/base/media/ic_public_settings.svg diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_settings.png b/product/phone/src/main/resources/base/media/ic_settings.png similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/base/media/ic_settings.png rename to product/phone/src/main/resources/base/media/ic_settings.png diff --git a/feature/systemui/phone/statusbar/src/main/resources/base/media/ic_status_bt.svg b/product/phone/src/main/resources/base/media/ic_status_bt.svg similarity index 100% rename from feature/systemui/phone/statusbar/src/main/resources/base/media/ic_status_bt.svg rename to product/phone/src/main/resources/base/media/ic_status_bt.svg diff --git a/feature/systemui/phone/statusbar/src/main/resources/base/media/ic_statusbar_gps.svg b/product/phone/src/main/resources/base/media/ic_statusbar_gps.svg similarity index 100% rename from feature/systemui/phone/statusbar/src/main/resources/base/media/ic_statusbar_gps.svg rename to product/phone/src/main/resources/base/media/ic_statusbar_gps.svg diff --git a/feature/systemui/phone/statusbar/src/main/resources/phone/media/ic_statusbar_nfc.svg b/product/phone/src/main/resources/base/media/ic_statusbar_nfc.svg similarity index 100% rename from feature/systemui/phone/statusbar/src/main/resources/phone/media/ic_statusbar_nfc.svg rename to product/phone/src/main/resources/base/media/ic_statusbar_nfc.svg diff --git a/feature/systemui/phone/statusbar/src/main/resources/base/media/ic_statusbar_phone.svg b/product/phone/src/main/resources/base/media/ic_statusbar_phone.svg similarity index 100% rename from feature/systemui/phone/statusbar/src/main/resources/base/media/ic_statusbar_phone.svg rename to product/phone/src/main/resources/base/media/ic_statusbar_phone.svg diff --git a/feature/systemui/ringmodecomponent/src/main/resources/base/media/ic_statusbar_ring_off_filled.svg b/product/phone/src/main/resources/base/media/ic_statusbar_ring_off_filled.svg similarity index 100% rename from feature/systemui/ringmodecomponent/src/main/resources/base/media/ic_statusbar_ring_off_filled.svg rename to product/phone/src/main/resources/base/media/ic_statusbar_ring_off_filled.svg diff --git a/feature/systemui/ringmodecomponent/src/main/resources/base/media/ic_statusbar_vibration_on.svg b/product/phone/src/main/resources/base/media/ic_statusbar_vibration_on.svg similarity index 100% rename from feature/systemui/ringmodecomponent/src/main/resources/base/media/ic_statusbar_vibration_on.svg rename to product/phone/src/main/resources/base/media/ic_statusbar_vibration_on.svg diff --git a/feature/systemui/wificomponent/src/main/resources/base/media/wifi.svg b/product/phone/src/main/resources/base/media/wifi.svg similarity index 100% rename from feature/systemui/wificomponent/src/main/resources/base/media/wifi.svg rename to product/phone/src/main/resources/base/media/wifi.svg diff --git a/feature/systemui/wificomponent/src/main/resources/base/media/wifi_d.svg b/product/phone/src/main/resources/base/media/wifi_d.svg similarity index 100% rename from feature/systemui/wificomponent/src/main/resources/base/media/wifi_d.svg rename to product/phone/src/main/resources/base/media/wifi_d.svg diff --git a/product/phone/src/main/resources/base/profile/main_pages.json b/product/phone/src/main/resources/base/profile/main_pages.json index daf941ed..53da1808 100644 --- a/product/phone/src/main/resources/base/profile/main_pages.json +++ b/product/phone/src/main/resources/base/profile/main_pages.json @@ -4,8 +4,8 @@ "pages/EmptyPage", "pages/EntryView", "pages/RecentView", - "screenlock/pages/digitalPassword", - "screenlock/pages/mixedPassword", - "screenlock/pages/customPassword" + "WindowScene/screenlock/pages/digitalPassword", + "WindowScene/screenlock/pages/mixedPassword", + "WindowScene/screenlock/pages/customPassword" ] } diff --git a/product/phone/src/main/resources/en_US/element/string.json b/product/phone/src/main/resources/en_US/element/string.json index 004f9620..f23e17e1 100644 --- a/product/phone/src/main/resources/en_US/element/string.json +++ b/product/phone/src/main/resources/en_US/element/string.json @@ -175,6 +175,134 @@ { "name": "isUninstall", "value": "Uninstall " + }, + { + "name": "status_bar_position_landscape", + "value": "2" + }, + { + "name": "status_bar_position_portrait", + "value": "2" + }, + { + "name": "net_null", + "value": "No SIM" + }, + { + "name": "2G", + "value": "2G" + }, + { + "name": "3G", + "value": "3G" + }, + { + "name": "4G", + "value": "4G" + }, + { + "name": "5G", + "value": "5G" + }, + { + "name": "signal_null", + "value": "×" + }, + { + "name": "incoming_call", + "value": "Incoming call" + }, + { + "name": "communicate_by_phone", + "value": "communicate" + }, + { + "name": "monday", + "value": "monday" + }, + { + "name": "tuesday", + "value": "tuesday" + }, + { + "name": "wednesday", + "value": "wednesday" + }, + { + "name": "thursday", + "value": "thursday" + }, + { + "name": "friday", + "value": "friday" + }, + { + "name": "saturday", + "value": "saturday" + }, + { + "name": "sunday", + "value": "sunday" + }, + { + "name": "day", + "value": "day" + }, + { + "name": "month", + "value": "month" + }, + { + "name": "no_notification", + "value": "No Notification" + }, + { + "name": "airplane_mode", + "value": "Airplane mode" + }, + { + "name": "control_center_complex_toggle_bluetooth_title", + "value": "Bluetooth" + }, + { + "name": "control_center_complex_toggle_location_title", + "value": "Location" + }, + { + "name": "control_center_complex_toggle_ring_mode_title_on", + "value": "Sound" + }, + { + "name": "control_center_complex_toggle_ring_mode_title_off", + "value": "Silent" + }, + { + "name": "control_center_complex_toggle_ring_mode_title_vibration", + "value": "Vibration" + }, + { + "name": "nav_bar_position_landscape", + "value": "4" + }, + { + "name": "status_bar_size_landscape", + "value": "48" + }, + { + "name": "nav_bar_size_landscape", + "value": "36" + }, + { + "name": "nav_bar_position_portrait", + "value": "4" + }, + { + "name": "nav_bar_size_portrait", + "value": "36" + }, + { + "name": "control_center_complex_toggle_nfc_mode_title", + "value": "NFC" } ] } \ No newline at end of file diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/phone/element/float.json b/product/phone/src/main/resources/phone/element/float.json similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/phone/element/float.json rename to product/phone/src/main/resources/phone/element/float.json diff --git a/feature/systemui/phone/dropdownpanel/src/main/resources/phone/media/dropdownpanel_bgc.png b/product/phone/src/main/resources/phone/media/dropdownpanel_bgc.png similarity index 100% rename from feature/systemui/phone/dropdownpanel/src/main/resources/phone/media/dropdownpanel_bgc.png rename to product/phone/src/main/resources/phone/media/dropdownpanel_bgc.png diff --git a/feature/systemui/phone/statusbar/src/main/resources/phone/media/ic_status_bt.svg b/product/phone/src/main/resources/phone/media/ic_status_bt.svg similarity index 100% rename from feature/systemui/phone/statusbar/src/main/resources/phone/media/ic_status_bt.svg rename to product/phone/src/main/resources/phone/media/ic_status_bt.svg diff --git a/feature/systemui/phone/statusbar/src/main/resources/phone/media/ic_statusbar_gps.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_gps.svg similarity index 100% rename from feature/systemui/phone/statusbar/src/main/resources/phone/media/ic_statusbar_gps.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_gps.svg diff --git a/feature/systemui/statusbarcomponent/src/main/resources/base/media/ic_statusbar_nfc.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_nfc.svg similarity index 100% rename from feature/systemui/statusbarcomponent/src/main/resources/base/media/ic_statusbar_nfc.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_nfc.svg diff --git a/feature/systemui/phone/statusbar/src/main/resources/phone/media/ic_statusbar_phone.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_phone.svg similarity index 100% rename from feature/systemui/phone/statusbar/src/main/resources/phone/media/ic_statusbar_phone.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_phone.svg diff --git a/feature/systemui/ringmodecomponent/src/main/resources/phone/media/ic_statusbar_ring_off_filled.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_ring_off_filled.svg similarity index 100% rename from feature/systemui/ringmodecomponent/src/main/resources/phone/media/ic_statusbar_ring_off_filled.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_ring_off_filled.svg diff --git a/feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_1.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_signal_1.svg similarity index 100% rename from feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_1.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_signal_1.svg diff --git a/feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_2.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_signal_2.svg similarity index 100% rename from feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_2.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_signal_2.svg diff --git a/feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_3.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_signal_3.svg similarity index 100% rename from feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_3.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_signal_3.svg diff --git a/feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_4.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_signal_4.svg similarity index 100% rename from feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_4.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_signal_4.svg diff --git a/feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_full.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_signal_full.svg similarity index 100% rename from feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_full.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_signal_full.svg diff --git a/feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_no.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_signal_no.svg similarity index 100% rename from feature/systemui/signalcomponent/src/main/resources/phone/media/ic_statusbar_signal_no.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_signal_no.svg diff --git a/feature/systemui/ringmodecomponent/src/main/resources/phone/media/ic_statusbar_vibration_on.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_vibration_on.svg similarity index 100% rename from feature/systemui/ringmodecomponent/src/main/resources/phone/media/ic_statusbar_vibration_on.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_vibration_on.svg diff --git a/feature/systemui/wificomponent/src/main/resources/phone/media/ic_statusbar_wifi_1.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_wifi_1.svg similarity index 100% rename from feature/systemui/wificomponent/src/main/resources/phone/media/ic_statusbar_wifi_1.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_wifi_1.svg diff --git a/feature/systemui/wificomponent/src/main/resources/phone/media/ic_statusbar_wifi_2.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_wifi_2.svg similarity index 100% rename from feature/systemui/wificomponent/src/main/resources/phone/media/ic_statusbar_wifi_2.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_wifi_2.svg diff --git a/feature/systemui/wificomponent/src/main/resources/phone/media/ic_statusbar_wifi_3.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_wifi_3.svg similarity index 100% rename from feature/systemui/wificomponent/src/main/resources/phone/media/ic_statusbar_wifi_3.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_wifi_3.svg diff --git a/feature/systemui/wificomponent/src/main/resources/phone/media/ic_statusbar_wifi_full.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_wifi_full.svg similarity index 100% rename from feature/systemui/wificomponent/src/main/resources/phone/media/ic_statusbar_wifi_full.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_wifi_full.svg diff --git a/feature/systemui/wificomponent/src/main/resources/phone/media/ic_statusbar_wifi_no.svg b/product/phone/src/main/resources/phone/media/ic_statusbar_wifi_no.svg similarity index 100% rename from feature/systemui/wificomponent/src/main/resources/phone/media/ic_statusbar_wifi_no.svg rename to product/phone/src/main/resources/phone/media/ic_statusbar_wifi_no.svg diff --git a/product/phone/src/main/resources/zh_CN/element/string.json b/product/phone/src/main/resources/zh_CN/element/string.json index 5cc319c1..97f01352 100644 --- a/product/phone/src/main/resources/zh_CN/element/string.json +++ b/product/phone/src/main/resources/zh_CN/element/string.json @@ -175,6 +175,134 @@ { "name": "remove_app_from_folder", "value": "移出文件夹" + }, + { + "name": "status_bar_position_landscape", + "value": "2" + }, + { + "name": "status_bar_position_portrait", + "value": "2" + }, + { + "name": "net_null", + "value": "没有 SIM 卡" + }, + { + "name": "2G", + "value": "2G" + }, + { + "name": "3G", + "value": "3G" + }, + { + "name": "4G", + "value": "4G" + }, + { + "name": "5G", + "value": "5G" + }, + { + "name": "signal_null", + "value": "×" + }, + { + "name": "incoming_call", + "value": "来电" + }, + { + "name": "communicate_by_phone", + "value": "通话" + }, + { + "name": "monday", + "value": "星期一" + }, + { + "name": "tuesday", + "value": "星期二" + }, + { + "name": "wednesday", + "value": "星期三" + }, + { + "name": "thursday", + "value": "星期四" + }, + { + "name": "friday", + "value": "星期五" + }, + { + "name": "saturday", + "value": "星期六" + }, + { + "name": "sunday", + "value": "星期日" + }, + { + "name": "day", + "value": "日" + }, + { + "name": "month", + "value": "月" + }, + { + "name": "no_notification", + "value": "没有通知" + }, + { + "name": "airplane_mode", + "value": "飞行模式" + }, + { + "name": "control_center_complex_toggle_bluetooth_title", + "value": "蓝牙" + }, + { + "name": "control_center_complex_toggle_location_title", + "value": "位置信息" + }, + { + "name": "control_center_complex_toggle_ring_mode_title_on", + "value": "响铃" + }, + { + "name": "control_center_complex_toggle_ring_mode_title_off", + "value": "静音" + }, + { + "name": "control_center_complex_toggle_ring_mode_title_vibration", + "value": "振动" + }, + { + "name": "nav_bar_position_landscape", + "value": "4" + }, + { + "name": "status_bar_size_landscape", + "value": "48" + }, + { + "name": "nav_bar_size_landscape", + "value": "36" + }, + { + "name": "nav_bar_position_portrait", + "value": "4" + }, + { + "name": "nav_bar_size_portrait", + "value": "36" + }, + { + "name": "control_center_complex_toggle_nfc_mode_title", + "value": "NFC" } ] } \ No newline at end of file -- Gitee