diff --git a/features/bluetoothcomponent/src/main/ets/com/ohos/model/BluetoothService.ts b/features/bluetoothcomponent/src/main/ets/com/ohos/model/BluetoothService.ts index f48f9a71..a54c0610 100644 --- a/features/bluetoothcomponent/src/main/ets/com/ohos/model/BluetoothService.ts +++ b/features/bluetoothcomponent/src/main/ets/com/ohos/model/BluetoothService.ts @@ -49,9 +49,11 @@ export class BluetoothService { if (this.mIsBluetoothOpen != isOpen) { Log.showInfo(TAG, `state change: ${isOpen}`); this.mIsBluetoothOpen = isOpen; - bluetooth.setBluetoothScanMode(bluetooth.ScanMode.SCAN_MODE_CONNECTABLE_GENERAL_DISCOVERABLE, 0); this.mListener?.updateState(this.mIsBluetoothOpen); } + if(state == bluetooth.BluetoothState.STATE_ON) { + bluetooth.setBluetoothScanMode(bluetooth.ScanMode.SCAN_MODE_CONNECTABLE_GENERAL_DISCOVERABLE, 0); + } }); Log.showInfo(TAG, `startService, mIsBluetoothOpen: ${this.mIsBluetoothOpen}`); } diff --git a/features/managementcomponent/src/main/ets/com/ohos/view/component/switchComponent.ets b/features/managementcomponent/src/main/ets/com/ohos/view/component/switchComponent.ets index fd75380c..9564aded 100644 --- a/features/managementcomponent/src/main/ets/com/ohos/view/component/switchComponent.ets +++ b/features/managementcomponent/src/main/ets/com/ohos/view/component/switchComponent.ets @@ -20,7 +20,7 @@ const TAG = 'ManagementComponent-SwitchComponent'; @Component export default struct SwitchComponent { @Link title: Resource; - @Link describe: Resource; + describe: Resource; private initializationAction: (params?) => Promise private settingAction: (params?) => void private register?: (listener) => void diff --git a/features/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts b/features/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts index 37de305f..fabc550d 100644 --- a/features/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts +++ b/features/noticeitem/src/main/ets/com/ohos/noticeItem/model/ParseDataUtil.ts @@ -23,6 +23,7 @@ import DistributionManager from './NotificationDistributionManager'; import NotificationManager from './NotificationManager'; import Constants, {NotificationItemData} from '../common/constants'; import {NotificationConfig} from './NotificationConfig'; +import TimeManager from '../../../../../../../../../common/src/main/ets/default/TimeManager' const TAG = 'Notification_ParseDataUtil'; let mDate = new Date(); @@ -63,7 +64,7 @@ export default class ParseDataUtil { hashcode: request.hashCode, contentType: `${request?.content?.contentType}`, timestamp: request.deliveryTime, - time: ParseDataUtil.getStandardTime(request.deliveryTime), + time: TimeManager.formatTime(new Date(request.deliveryTime)), appName: appMessage.appName, want: request.wantAgent, bundleName: request.creatorBundleName, diff --git a/features/signalcomponent/src/main/ets/default/pages/signalIcon.ets b/features/signalcomponent/src/main/ets/default/pages/signalIcon.ets index a59d2a37..fd06cd2f 100644 --- a/features/signalcomponent/src/main/ets/default/pages/signalIcon.ets +++ b/features/signalcomponent/src/main/ets/default/pages/signalIcon.ets @@ -14,7 +14,7 @@ */ import Constants from '../common/constants'; -import mSignalModel from '../SignalModel'; +import mSignalModel from '../signalModel'; import Log from '../../../../../../../common/src/main/ets/default/Log' import { TintContentInfo } from '../../../../../../../common/src/main/ets/default/TintStateManager' import StyleConfigurationCommon, { CommonStyle diff --git a/features/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts b/features/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts index 41c404bf..b7f7659a 100644 --- a/features/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts +++ b/features/statusbarcomponent/src/main/ets/com/ohos/model/StatusBarService.ts @@ -22,7 +22,7 @@ import { ItemComponentData, PluginComponentData, FilterData import PluginDataSourceAdapter from '../../../../../../../../common/src/main/ets/plugindatasource/PluginDataSourceAdapter'; import AbilityManager from '../../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import Constants, { StatusBarData, StatusBarComponentData, LayoutGroup, StatusBarConfig } from '../common/Constants'; -import { parseEventString } from '../../../../../../../../common/src/main/ets/default/Event/EventUtil'; +import { parseEventString } from '../../../../../../../../common/src/main/ets/default/event/EventUtil'; export interface StatusBarListener { setStatusBarLayout(layout: string[][]): void; diff --git a/features/wificomponent/src/main/ets/default/pages/wifiComponent.ets b/features/wificomponent/src/main/ets/default/pages/wifiComponent.ets index 19b63d73..74052e3f 100644 --- a/features/wificomponent/src/main/ets/default/pages/wifiComponent.ets +++ b/features/wificomponent/src/main/ets/default/pages/wifiComponent.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import mWifiManger from '../WifiModel' +import mWifiManger from '../wifiModel' import Log from '../../../../../../../common/src/main/ets/default/Log' import EventManager from "../../../../../../../common/src/main/ets/default/event/EventManager" import {obtainStartAbility} from "../../../../../../../common/src/main/ets/default/event/EventUtil" diff --git a/features/wificomponent/src/main/ets/default/pages/wifiIcon.ets b/features/wificomponent/src/main/ets/default/pages/wifiIcon.ets index d69e79e7..d8cd535d 100644 --- a/features/wificomponent/src/main/ets/default/pages/wifiIcon.ets +++ b/features/wificomponent/src/main/ets/default/pages/wifiIcon.ets @@ -14,7 +14,7 @@ */ import Constants from '../common/constants' -import mWifiModel from '../WifiModel' +import mWifiModel from '../wifiModel' import Log from '../../../../../../../common/src/main/ets/default/Log' import { TintContentInfo } from '../../../../../../../common/src/main/ets/default/TintStateManager' import StyleConfigurationCommon, { CommonStyle diff --git a/product/default/navigationBar/src/main/ets/pages/threeLayout.ets b/product/default/navigationBar/src/main/ets/pages/threeLayout.ets index 22f8543b..45359fd0 100644 --- a/product/default/navigationBar/src/main/ets/pages/threeLayout.ets +++ b/product/default/navigationBar/src/main/ets/pages/threeLayout.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import keyButton from './keybutton'; +import keyButton from './keyButton'; import Constants from '../common/constants' import Log from '../../../../../../../common/src/main/ets/default/Log'; const TAG = 'NavigationBar-ThreeLayout'; diff --git a/product/default/notificationmanagement/src/main/ets/pages/batchSetEnable.ets b/product/default/notificationmanagement/src/main/ets/pages/batchSetEnable.ets index 4feae616..76227adb 100644 --- a/product/default/notificationmanagement/src/main/ets/pages/batchSetEnable.ets +++ b/product/default/notificationmanagement/src/main/ets/pages/batchSetEnable.ets @@ -15,8 +15,8 @@ //import Window from '@ohos.window'; import Log from '../../../../../../../common/src/main/ets/default/Log'; -import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headcomponent'; -import AppItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/appitemcomponent'; +import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headComponent'; +import AppItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/appItemComponent'; import ConfigData from '../common/constants'; import Router from '@system.router' import ViewModel from '../vm/notificationManagenmentViewModel' @@ -33,54 +33,54 @@ export default struct BatchSetEnable { build() { Column() { GridContainer({columns:12, sizeType: SizeType.Auto, gutter: vp2px(1) === 2 ? '12vp' : '0vp', margin: vp2px(1) === 2 ? '12vp' : '0vp'}) { - Row() { - Column() { - HeadComponent({ headName: $headName, isActive: true }); - List() { - ForEach(this.appList, (item) => { - ListItem() { - AppItemComponent({ - appIcon: item.appIcon, - appTitle: item.appTitle, - appSummary: item.appSummary, - appValue: item.appValue, - appArrow: item.appArrow, - appArrowStyle: '', - appUri: '', - appBundleName:item.appBundleName, - appUid:item.appUid, - appSwitch:1 - }); - } - .height($r('app.float.appitem_item_height')); - }); + Row() { + Column() { + HeadComponent({ headName: $headName, isActive: true }); + List() { + ForEach(this.appList, (item) => { + ListItem() { + AppItemComponent({ + appIcon: item.appIcon, + appTitle: item.appTitle, + appSummary: item.appSummary, + appValue: item.appValue, + appArrow: item.appArrow, + appArrowStyle: '', + appUri: '', + appBundleName:item.appBundleName, + appUid:item.appUid, + appSwitch:1 + }); + } + .height($r('app.float.appitem_item_height')); + }); + } + .divider({ + strokeWidth: 1, + color: $r('app.color.divider_color'), + startMargin: $r('app.float.divider_margin_l_info'), + endMargin: $r('app.float.divider_margin_r') + }) + .width(ConfigData.WH_100_100) + .layoutWeight(1) + .padding({ left: $r('app.float.itemComp_padding_l'), right: $r('app.float.itemComp_padding_r') }) + .align(Alignment.Top) + .backgroundColor(Color.White) + .visibility(Visibility.Visible) + .zIndex(0) + .border({ width: $r('app.float.border_width'), color:Color.White, + radius:$r('app.float.border_radius') }) + .margin({ top: $r('app.float.itemComp_margin_b') }); } - .divider({ - strokeWidth: 1, - color: $r('app.color.divider_color'), - startMargin: $r('app.float.divider_margin_l_info'), - endMargin: $r('app.float.divider_margin_r') - }) + .padding({ left: $r('sys.float.ohos_id_default_padding_start'), right: $r('sys.float.ohos_id_default_padding_start') }) .width(ConfigData.WH_100_100) - .layoutWeight(1) - .padding({ left: $r('app.float.itemComp_padding_l'), right: $r('app.float.itemComp_padding_r') }) - .align(Alignment.Top) - .backgroundColor(Color.White) - .visibility(Visibility.Visible) - .zIndex(0) - .border({ width: $r('app.float.border_width'), color:Color.White, - radius:$r('app.float.border_radius') }) - .margin({ top: $r('app.float.itemComp_margin_b') }); + .flexShrink(1) + .useSizeType({ + xs: { span: 12, offset: 0 }, sm: { span: 12, offset: 0 }, + md: { span: 12, offset: 0 }, lg: { span: 8, offset: 2 } + }); } - .padding({ left: $r('sys.float.ohos_id_default_padding_start'), right: $r('sys.float.ohos_id_default_padding_start') }) .width(ConfigData.WH_100_100) - .flexShrink(1) - .useSizeType({ - xs: { span: 12, offset: 0 }, sm: { span: 12, offset: 0 }, - md: { span: 12, offset: 0 }, lg: { span: 8, offset: 2 } - }); - } - .width(ConfigData.WH_100_100) } } .backgroundColor($r("sys.color.ohos_id_color_sub_background")) diff --git a/product/default/notificationmanagement/src/main/ets/pages/noDisturb.ets b/product/default/notificationmanagement/src/main/ets/pages/noDisturb.ets index fe9ed791..dfa42721 100644 --- a/product/default/notificationmanagement/src/main/ets/pages/noDisturb.ets +++ b/product/default/notificationmanagement/src/main/ets/pages/noDisturb.ets @@ -14,14 +14,14 @@ */ import Log from '../../../../../../../common/src/main/ets/default/Log'; -import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headcomponent'; +import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headComponent'; import ConfigData from '../common/constants'; import deviceInfo from '@ohos.deviceInfo'; -import { concatTime } from '../../../../../../../common/src/main/ets/default/timemanager'; -import ItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/itemcomponent'; +import { concatTime } from '../../../../../../../common/src/main/ets/default/TimeManager'; +import ItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/itemComponent'; import {DoNotDisturbType} from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/common/constants'; -import NoDisturbingModel from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/nodisturbingmodel'; -import ViewModel from '../vm/nodisturbviewmodel'; +import NoDisturbingModel from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/noDisturbingModel'; +import ViewModel from '../vm/noDisturbViewModel'; const deviceTypeInfo = deviceInfo.deviceType; const TAG = 'NotificationManagement-NoDisturb'; @@ -105,132 +105,132 @@ export default struct NoDisturb { build() { Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Start, justifyContent: FlexAlign.Start }) { Column() { - GridContainer({columns:12, sizeType: SizeType.Auto, gutter: vp2px(1) === 2 ? '12vp' : '0vp', margin: vp2px(1) === 2 ? '12vp' : '0vp'}) { - Row() { - Column() { - HeadComponent({ headName: $headName, isActive: true }) - if (this.mRefreshCnt > 0) { + GridContainer({columns:12, sizeType: SizeType.Auto, gutter: vp2px(1) === 2 ? '12vp' : '0vp', margin: vp2px(1) === 2 ? '12vp' : '0vp'}) { + Row() { + Column() { + HeadComponent({ headName: $headName, isActive: true }) + if (this.mRefreshCnt > 0) { + Row() { + ItemComponent({ + title: $repeatTitle, + value: this.mViewModel.repeatName, + arrow: $arrow + }) + }.onClick(() => { + this.repeatDialogController.open() + }).margin({ bottom: $r('app.float.itemComp_margin_b') }) + + if (this.mViewModel.repeatMode == DoNotDisturbType.TYPE_CLEARLY) { + List() { + ListItem() { + Row() { + ItemComponent({ + title: $startDateTitle, + value: this.mViewModel.startDateClue, + arrow: $arrow + }) + }.onClick(() => { + this.startDateDialogController.open() + }) + } + ListItem() { + Row() { + ItemComponent({ + title: $startTitle, + value: this.mViewModel.startTimeClue, + arrow: $arrow + }) + }.onClick(() => { + this.startTimeDialogController.open() + }) + } + }.divider({ + strokeWidth: 1, + color: $r('app.color.divider_color'), + startMargin: $r('app.float.divider_margin_l'), + endMargin: $r('app.float.divider_margin_r') + }).width(ConfigData.WH_100_100) + .visibility(Visibility.Visible) + .zIndex(0) + .border({ width: $r('app.float.border_width'), color: Color.White, + radius: $r('app.float.border_radius') }) + .backgroundColor(Color.White) + .margin({ bottom: $r('app.float.itemComp_margin_b')}) + .flexShrink(1) + List() { + ListItem() { + Row() { + ItemComponent({ + title: $endDateTitle, + value: this.mViewModel.endDateClue, + arrow: $arrow + }) + }.onClick(() => { + this.endDateDialogController.open() + }) + } + ListItem() { + Row() { + ItemComponent({ + title: $endTitle, + value: this.mViewModel.endTimeClue, + arrow: $arrow + }) + }.onClick(() => { + this.endTimeDialogController.open() + }) + } + }.divider({ + strokeWidth: 1, + color: $r('app.color.divider_color'), + startMargin: $r('app.float.divider_margin_l'), + endMargin: $r('app.float.divider_margin_r') + }).width(ConfigData.WH_100_100) + .visibility(Visibility.Visible) + .zIndex(0) + .border({ width: $r('app.float.border_width'), color: Color.White, + radius: $r('app.float.border_radius') }) + .backgroundColor(Color.White) + .margin({ bottom: $r('app.float.itemComp_margin_b')}) + .flexShrink(1) + } else { Row() { ItemComponent({ - title: $repeatTitle, - value: this.mViewModel.repeatName, + title: $startTitle, + value: this.mViewModel.startTimeClue, arrow: $arrow }) }.onClick(() => { - this.repeatDialogController.open() - }).margin({ bottom: $r('app.float.itemComp_margin_b') }) - - if (this.mViewModel.repeatMode == DoNotDisturbType.TYPE_CLEARLY) { - List() { - ListItem() { - Row() { - ItemComponent({ - title: $startDateTitle, - value: this.mViewModel.startDateClue, - arrow: $arrow - }) - }.onClick(() => { - this.startDateDialogController.open() - }) - } - ListItem() { - Row() { - ItemComponent({ - title: $startTitle, - value: this.mViewModel.startTimeClue, - arrow: $arrow - }) - }.onClick(() => { - this.startTimeDialogController.open() - }) - } - }.divider({ - strokeWidth: 1, - color: $r('app.color.divider_color'), - startMargin: $r('app.float.divider_margin_l'), - endMargin: $r('app.float.divider_margin_r') - }).width(ConfigData.WH_100_100) - .visibility(Visibility.Visible) - .zIndex(0) - .border({ width: $r('app.float.border_width'), color: Color.White, - radius: $r('app.float.border_radius') }) - .backgroundColor(Color.White) - .margin({ bottom: $r('app.float.itemComp_margin_b')}) - .flexShrink(1) - List() { - ListItem() { - Row() { - ItemComponent({ - title: $endDateTitle, - value: this.mViewModel.endDateClue, - arrow: $arrow - }) - }.onClick(() => { - this.endDateDialogController.open() - }) - } - ListItem() { - Row() { - ItemComponent({ - title: $endTitle, - value: this.mViewModel.endTimeClue, - arrow: $arrow - }) - }.onClick(() => { - this.endTimeDialogController.open() - }) - } - }.divider({ - strokeWidth: 1, - color: $r('app.color.divider_color'), - startMargin: $r('app.float.divider_margin_l'), - endMargin: $r('app.float.divider_margin_r') - }).width(ConfigData.WH_100_100) - .visibility(Visibility.Visible) - .zIndex(0) - .border({ width: $r('app.float.border_width'), color: Color.White, - radius: $r('app.float.border_radius') }) - .backgroundColor(Color.White) - .margin({ bottom: $r('app.float.itemComp_margin_b')}) - .flexShrink(1) - } else { - Row() { - ItemComponent({ - title: $startTitle, - value: this.mViewModel.startTimeClue, - arrow: $arrow - }) - }.onClick(() => { - this.mPrevData = this.mViewModel.startTime - this.startTimeDialogController.open() - }).margin({ bottom: $r('app.float.itemComp_margin_b')}) - Row() { - ItemComponent({ - title: $endTitle, - value: this.mViewModel.endTimeClue, - arrow: $arrow - }) - }.onClick(() => { - this.mPrevData = this.mViewModel.endTime - this.endTimeDialogController.open() - }).margin({ bottom: $r('app.float.itemComp_margin_b')}) - } + this.mPrevData = this.mViewModel.startTime + this.startTimeDialogController.open() + }).margin({ bottom: $r('app.float.itemComp_margin_b')}) + Row() { + ItemComponent({ + title: $endTitle, + value: this.mViewModel.endTimeClue, + arrow: $arrow + }) + }.onClick(() => { + this.mPrevData = this.mViewModel.endTime + this.endTimeDialogController.open() + }).margin({ bottom: $r('app.float.itemComp_margin_b')}) } } - .width(ConfigData.WH_100_100) - .height(ConfigData.WH_100_100) - .padding({ - left: $r('sys.float.ohos_id_default_padding_start'), - right: $r('sys.float.ohos_id_default_padding_end') - }) - .useSizeType({ - xs: { span: 12, offset: 0 }, sm: { span: 12, offset: 0 }, - md: { span: 12, offset: 0 }, lg: { span: 8, offset: 2 } - }) } .width(ConfigData.WH_100_100) .height(ConfigData.WH_100_100) - } + .padding({ + left: $r('sys.float.ohos_id_default_padding_start'), + right: $r('sys.float.ohos_id_default_padding_end') + }) + .useSizeType({ + xs: { span: 12, offset: 0 }, sm: { span: 12, offset: 0 }, + md: { span: 12, offset: 0 }, lg: { span: 8, offset: 2 } + }) + } + .width(ConfigData.WH_100_100) + .height(ConfigData.WH_100_100) + } } .backgroundColor($r("sys.color.ohos_id_color_sub_background")) .width(ConfigData.WH_100_100) diff --git a/product/default/notificationmanagement/src/main/ets/pages/noDisturbPre.ets b/product/default/notificationmanagement/src/main/ets/pages/noDisturbPre.ets index f0566865..644e3750 100644 --- a/product/default/notificationmanagement/src/main/ets/pages/noDisturbPre.ets +++ b/product/default/notificationmanagement/src/main/ets/pages/noDisturbPre.ets @@ -16,9 +16,9 @@ //import Window from '@ohos.window'; import Log from '../../../../../../../common/src/main/ets/default/Log'; -import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headcomponent'; -import NoDisturbComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/nodisturbcomponent'; -import ItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/itemcomponent'; +import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headComponent'; +import NoDisturbComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/noDisturbComponent'; +import ItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/itemComponent'; import ConfigData from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/common/constants'; import Router from '@system.router'; diff --git a/product/default/notificationmanagement/src/main/ets/pages/notificationManagenment.ets b/product/default/notificationmanagement/src/main/ets/pages/notificationManagenment.ets index 60c1dba3..f0b090c0 100644 --- a/product/default/notificationmanagement/src/main/ets/pages/notificationManagenment.ets +++ b/product/default/notificationmanagement/src/main/ets/pages/notificationManagenment.ets @@ -16,15 +16,15 @@ //import Window from '@ohos.window'; import Log from '../../../../../../../common/src/main/ets/default/Log'; -import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headcomponent'; -import NoDisturbComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/nodisturbcomponent'; -import ItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/itemcomponent'; +import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headComponent'; +import NoDisturbComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/noDisturbComponent'; +import ItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/itemComponent'; import ConfigData from '../common/constants'; -import AppLstComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/applstcomponent'; +import AppLstComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/appLstComponent'; import Router from '@system.router'; -import ViewModel from '../vm/notificationmanagenmentviewmodel' -import Notification from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/notificationlistener'; -import SwitchComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/switchcomponent'; +import ViewModel from '../vm/notificationManagenmentViewmodel' +import Notification from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/notificationListener'; +import SwitchComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/switchComponent'; const TAG = 'NotificationManagement-Main'; @@ -40,140 +40,142 @@ export default struct notificationManagenment { @State allowDistributDescribe: Resource = $r('app.string.allowDistributDescribe') build() { - GridContainer({ + Column() { + GridContainer({ columns: 12, sizeType: SizeType.Auto, gutter: vp2px(1) === 2 ? '12vp' : '0vp', margin: vp2px(1) === 2 ? '24vp' : '0vp' }) { - Row() { - Column() { - HeadComponent({ headName: $headName, isActive: true }) + Row() { Column() { - Row() { - Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { - Column() { - Text($r('app.string.noDisturb')) - .fontSize($r('sys.float.ohos_id_text_size_body1')) - .fontColor($r('app.color.itemComp_title_color')) - .textAlign(TextAlign.Start) - .fontWeight(FontWeight.Bold) - .height($r('app.float.itemComp_height')) - .padding({ left: $r('sys.float.ohos_id_default_padding_start') }) - } - .flexShrink(1) - .align(Alignment.Start) - .alignItems(HorizontalAlign.Start) - - Row() { - if (this.mViewModel.isEffective) { - Text($r('app.string.noDisturb_opened')) + HeadComponent({ headName: $headName, isActive: true }) + Column() { + Row() { + Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { + Column() { + Text($r('app.string.noDisturb')) .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontColor($r('app.color.itemComp_title_color')) - .align(Alignment.End) - .margin({ right: $r("app.float.noDisturb_text_margin_right") }) - .fontWeight(FontWeight.Medium) - } else { - Text($r('app.string.noDisturb_closed')) - .fontSize($r('sys.float.ohos_id_text_size_body1')) - .fontColor($r('app.color.itemComp_title_color')) - .align(Alignment.End) - .margin({ right: $r("app.float.noDisturb_text_margin_right") }) - .fontWeight(FontWeight.Medium) + .textAlign(TextAlign.Start) + .fontWeight(FontWeight.Bold) + .height($r('app.float.itemComp_height')) + .padding({ left: $r('sys.float.ohos_id_default_padding_start') }) } - Image($r('app.media.ic_settings_arrow')) - .align(Alignment.End) - .width($r('app.float.itemComp_image_width')) - .height($r('app.float.itemComp_image_height')) + .flexShrink(1) + .align(Alignment.Start) + .alignItems(HorizontalAlign.Start) + + Row() { + if (this.mViewModel.isEffective) { + Text($r('app.string.noDisturb_opened')) + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('app.color.itemComp_title_color')) + .align(Alignment.End) + .margin({ right: $r("app.float.noDisturb_text_margin_right") }) + .fontWeight(FontWeight.Medium) + } else { + Text($r('app.string.noDisturb_closed')) + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('app.color.itemComp_title_color')) + .align(Alignment.End) + .margin({ right: $r("app.float.noDisturb_text_margin_right") }) + .fontWeight(FontWeight.Medium) + } + Image($r('app.media.ic_settings_arrow')) + .align(Alignment.End) + .width($r('app.float.itemComp_image_width')) + .height($r('app.float.itemComp_image_height')) + } + .padding({ right: $r('sys.float.ohos_id_default_padding_end') }) + .flexShrink(0) + .align(Alignment.End) + .alignItems(VerticalAlign.Center) } - .padding({ right: $r('sys.float.ohos_id_default_padding_end') }) - .flexShrink(0) - .align(Alignment.End) - .alignItems(VerticalAlign.Center) + .width(ConfigData.WH_100_100) + .height($r('app.float.itemComp_height')) + .border({ width: $r('app.float.border_width'), color: Color.White, + radius: $r('app.float.border_radius') }) + .backgroundColor(Color.White) } - .width(ConfigData.WH_100_100) .height($r('app.float.itemComp_height')) - .border({ width: $r('app.float.border_width'), color: Color.White, - radius: $r('app.float.border_radius') }) - .backgroundColor(Color.White) + .margin({ top: $r('app.float.noDisturb_margin_lf') }) + .align(Alignment.Start) + .onClick(() => { + Log.showDebug(TAG, `NoDisturbComponent on click`) + Router.push({ uri: 'pages/noDisturbPre' }); + }) + .width(ConfigData.WH_100_100) + .flexShrink(0) + + Divider() + .color($r('app.color.divider_color')) + .strokeWidth(1) + .padding({ + left: $r('sys.float.ohos_id_default_padding_start'), + right: $r('sys.float.ohos_id_default_padding_end') + }) + + Row() { + SwitchComponent({ + title: $allowDistribut, + describe: this.allowDistributDescribe, + initializationAction: () => this.switchComponentInit(), + settingAction: (params) => this.switchComponentSet(params) + }) + }.margin({ bottom: $r('app.float.noDisturb_margin_lf') }) } - .height($r('app.float.itemComp_height')) - .margin({ top: $r('app.float.noDisturb_margin_lf') }) - .align(Alignment.Start) - .onClick(() => { - Log.showDebug(TAG, `NoDisturbComponent on click`) - Router.push({ uri: 'pages/noDisturbPre' }); - }) + .backgroundColor(Color.White) + .border({ width: $r('app.float.border_width'), color: Color.White, + radius: $r('app.float.border_radius') }) + .margin({ top: $r('app.float.page_notice_title_margin_t') }); + + Row() { + Text($r('app.string.notificationManagement')) + .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontSize($r('sys.float.ohos_id_text_size_body2')) + .fontWeight(FontWeight.Medium) + .fontFamily('HarmonyHeiTi-Medium') + .margin({ top: $r('app.float.page_phrases_padding_t') }) + }.align(Alignment.Start) .width(ConfigData.WH_100_100) + .height($r('app.float.page_phrases_height')) + .padding({ left: $r('sys.float.ohos_id_default_padding_start') }) + + Row() { + ItemComponent({ title: $title, value: '', arrow: $arrow }) + }.onClick(() => { + Log.showDebug(TAG, `BatchManagement on click`) + Router.push({ uri: 'pages/batchSetEnable' }); + }).width(ConfigData.WH_100_100) .flexShrink(0) - Divider() - .color($r('app.color.divider_color')) - .strokeWidth(1) - .padding({ - left: $r('sys.float.ohos_id_default_padding_start'), - right: $r('sys.float.ohos_id_default_padding_end') - }) + Column() { + AppLstComponent() + }.width(ConfigData.WH_100_100) + .layoutWeight(1) + .margin({ top: $r('app.float.applist_margin_t') }); - Row() { - SwitchComponent({ - title: $allowDistribut, - describe: $allowDistributDescribe, - initializationAction: () => this.switchComponentInit(), - settingAction: (params) => this.switchComponentSet(params) - }) - }.margin({ bottom: $r('app.float.noDisturb_margin_lf') }) } - .backgroundColor(Color.White) - .border({ width: $r('app.float.border_width'), color: Color.White, - radius: $r('app.float.border_radius') }) - .margin({ top: $r('app.float.page_notice_title_margin_t') }); - - Row() { - Text($r('app.string.notificationManagement')) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) - .fontSize($r('sys.float.ohos_id_text_size_body2')) - .fontWeight(FontWeight.Medium) - .fontFamily('HarmonyHeiTi-Medium') - .margin({ top: $r('app.float.page_phrases_padding_t') }) - }.align(Alignment.Start) .width(ConfigData.WH_100_100) - .height($r('app.float.page_phrases_height')) - .padding({ left: $r('sys.float.ohos_id_default_padding_start') }) - - Row() { - ItemComponent({ title: $title, value: '', arrow: $arrow }) - }.onClick(() => { - Log.showDebug(TAG, `BatchManagement on click`) - Router.push({ uri: 'pages/batchSetEnable' }); - }).width(ConfigData.WH_100_100) - .flexShrink(0) - - Column() { - AppLstComponent() - }.width(ConfigData.WH_100_100) - .layoutWeight(1) - .margin({ top: $r('app.float.applist_margin_t') }); + .height(ConfigData.WH_100_100) + .padding({ + left: $r('sys.float.ohos_id_default_padding_start'), + right: $r('sys.float.ohos_id_default_padding_end') + }) + .useSizeType({ + xs: { span: 12, offset: 0 }, sm: { span: 12, offset: 0 }, + md: { span: 12, offset: 0 }, lg: { span: 8, offset: 2 } + }); } .width(ConfigData.WH_100_100) - .height(ConfigData.WH_100_100) - .padding({ - left: $r('sys.float.ohos_id_default_padding_start'), - right: $r('sys.float.ohos_id_default_padding_end') - }) - .useSizeType({ - xs: { span: 12, offset: 0 }, sm: { span: 12, offset: 0 }, - md: { span: 12, offset: 0 }, lg: { span: 8, offset: 2 } - }); - + .height(ConfigData.WH_100_100); } .width(ConfigData.WH_100_100) - .height(ConfigData.WH_100_100); + .height(ConfigData.WH_100_100) + .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } - .width(ConfigData.WH_100_100) - .height(ConfigData.WH_100_100) - .backgroundColor($r("sys.color.ohos_id_color_sub_background")) } aboutToAppear(): void{ diff --git a/product/default/notificationmanagement/src/main/ets/pages/setEnable.ets b/product/default/notificationmanagement/src/main/ets/pages/setEnable.ets index ffea2d96..3b1ede91 100644 --- a/product/default/notificationmanagement/src/main/ets/pages/setEnable.ets +++ b/product/default/notificationmanagement/src/main/ets/pages/setEnable.ets @@ -15,13 +15,13 @@ //import Window from '@ohos.window'; import Log from '../../../../../../../common/src/main/ets/default/Log'; -import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headcomponent'; -import AppItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/appitemcomponent'; -import SwitchComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/switchcomponent'; -import SlotLstComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/slotlstcomponent'; +import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headComponent'; +import AppItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/appItemComponent'; +import SwitchComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/switchComponent'; +import SlotLstComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/slotLstComponent'; import ConfigData from '../common/constants'; import Router from '@system.router' -import notificationListener from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/notificationlistener'; +import notificationListener from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/notificationListener'; import Notification from '@ohos.notification'; const TAG = 'NotificationManagement-SetEnable'; diff --git a/product/default/notificationmanagement/src/main/ets/pages/slotSetting.ets b/product/default/notificationmanagement/src/main/ets/pages/slotSetting.ets index 9548e10d..7716af27 100644 --- a/product/default/notificationmanagement/src/main/ets/pages/slotSetting.ets +++ b/product/default/notificationmanagement/src/main/ets/pages/slotSetting.ets @@ -14,13 +14,13 @@ */ import Log from '../../../../../../../common/src/main/ets/default/Log'; -import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headcomponent'; -import AppItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/appitemcomponent'; -import SwitchComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/switchcomponent'; +import HeadComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/headComponent'; +import AppItemComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/appItemComponent'; +import SwitchComponent from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/view/component/switchComponent'; import ConfigData from '../common/constants'; import NotificationConfigData from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/common/constants'; import Router from '@system.router'; -import NotificationListener from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/notificationlistener'; +import NotificationListener from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/notificationListener'; import notification from '@ohos.notification'; const TAG = 'NotificationManagement-SlotSetting'; diff --git a/product/default/notificationmanagement/src/main/ets/vm/noDisturbViewModel.ts b/product/default/notificationmanagement/src/main/ets/vm/noDisturbViewModel.ts index 2c3dff8d..b20d7c03 100644 --- a/product/default/notificationmanagement/src/main/ets/vm/noDisturbViewModel.ts +++ b/product/default/notificationmanagement/src/main/ets/vm/noDisturbViewModel.ts @@ -15,8 +15,8 @@ import ConfigData from '../common/constants'; import Log from '../../../../../../../common/src/main/ets/default/Log'; -import NoDisturbingModel from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/nodisturbingmodel'; -import NoDisturbComponentViewModel from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/vm/nodisturbcomponentviewmodel'; +import NoDisturbingModel from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/noDisturbingModel'; +import NoDisturbComponentViewModel from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/vm/noDisturbComponentViewModel'; import FeaturesConfigData, {DoNotDisturbType} from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/common/constants'; const TAG = 'NotificationManagement-NoDisturbViewModel'; @@ -49,8 +49,8 @@ export default class NoDisturbViewModel extends NoDisturbComponentViewModel { setClues(): void { Log.showDebug(TAG, 'setClues'); if (this.repeatMode == DoNotDisturbType.TYPE_DAILY || - this.repeatMode == DoNotDisturbType.TYPE_ONCE || - this.repeatMode == DoNotDisturbType.TYPE_CLEARLY) { + this.repeatMode == DoNotDisturbType.TYPE_ONCE || + this.repeatMode == DoNotDisturbType.TYPE_CLEARLY) { this.isEffective = true; } else { this.isEffective = false; diff --git a/product/default/notificationmanagement/src/main/ets/vm/notificationManagenmentViewModel.ts b/product/default/notificationmanagement/src/main/ets/vm/notificationManagenmentViewModel.ts index 41887368..b683bd9f 100644 --- a/product/default/notificationmanagement/src/main/ets/vm/notificationManagenmentViewModel.ts +++ b/product/default/notificationmanagement/src/main/ets/vm/notificationManagenmentViewModel.ts @@ -14,10 +14,10 @@ */ import Log from '../../../../../../../common/src/main/ets/default/Log'; -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilitymanager'; -import BundleResourceModel from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/bundleresourcemodel'; +import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; +import BundleResourceModel from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/model/bundleResourceModel'; import display from '@ohos.display'; -import NoDisturbComponentViewModel from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/vm/nodisturbcomponentviewmodel'; +import NoDisturbComponentViewModel from '../../../../../../../features/managementcomponent/src/main/ets/com/ohos/vm/noDisturbComponentViewModel'; import Router from '@system.router'; const TAG = 'NotificationManagement-NotificationManagenmentViewModel'; diff --git a/product/default/volumepanel/src/main/ets/pages/index.ets b/product/default/volumepanel/src/main/ets/pages/index.ets index 12976941..f2e68ac6 100644 --- a/product/default/volumepanel/src/main/ets/pages/index.ets +++ b/product/default/volumepanel/src/main/ets/pages/index.ets @@ -17,7 +17,7 @@ import CommonStyleManager from '../../../../../../../common/src/main/ets/default import VolumePanelComponent from '../../../../../../../features/volumepanelcomponent/src/main/ets/com/ohos/pages/VolumePanelComponent' import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' import StyleManager from '../common/StyleManager' -import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/windowmanager' +import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/WindowManager' const TAG = 'VolumePanel-Index' diff --git a/product/pc/controlpanel/src/main/ets/pages/common/StyleManager.ts b/product/pc/controlpanel/src/main/ets/pages/common/StyleManager.ts index 8674a216..0f4d754d 100644 --- a/product/pc/controlpanel/src/main/ets/pages/common/StyleManager.ts +++ b/product/pc/controlpanel/src/main/ets/pages/common/StyleManager.ts @@ -13,12 +13,12 @@ * limitations under the License. */ import Log from '../../../../../../../../common/src/main/ets/default/Log'; -import AbilityManager from '../../../../../../../../common/src/main/ets/default/abilitymanager/abilitymanager'; -import CommonTemplateStyleConfiguration from '../../../../../../../../common/src/main/ets/template/common/styleconfiguration'; -import ControlCenterStyleConfiguration from '../../../../../../../../features/controlcentercomponent/src/main/ets/com/ohos/common/styleconfiguration'; -import BrightnessStyleConfiguration from '../../../../../../../../features/brightnesscomponent/src/main/ets/default/common/styleconfiguration'; -import RingModeStyleConfiguration from '../../../../../../../../features/ringmodecomponent/src/main/ets/com/ohos/common/styleconfiguration'; -import IndexStyleConfiguration from './styleconfiguration'; +import AbilityManager from '../../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; +import CommonTemplateStyleConfiguration from '../../../../../../../../common/src/main/ets/template/common/StyleConfiguration'; +import ControlCenterStyleConfiguration from '../../../../../../../../features/controlcentercomponent/src/main/ets/com/ohos/common/StyleConfiguration'; +import BrightnessStyleConfiguration from '../../../../../../../../features/brightnesscomponent/src/main/ets/default/common/StyleConfiguration'; +import RingModeStyleConfiguration from '../../../../../../../../features/ringmodecomponent/src/main/ets/com/ohos/common/StyleConfiguration'; +import IndexStyleConfiguration from './StyleConfiguration'; const TAG = 'ControlPanel-StyleManager'; diff --git a/product/pc/controlpanel/src/main/ets/pages/index.ets b/product/pc/controlpanel/src/main/ets/pages/index.ets index aba3393f..8ce3b307 100644 --- a/product/pc/controlpanel/src/main/ets/pages/index.ets +++ b/product/pc/controlpanel/src/main/ets/pages/index.ets @@ -15,7 +15,7 @@ import Log from '../../../../../../../common/src/main/ets/default/Log' import CommonStyleManager from '../../../../../../../common/src/main/ets/default/CommonStyleManager' import HeightConfigUtils from '../../../../../../../common/src/main/ets/default/heightcofigUtils/HeightConfigUtils' -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/AbilityManager' +import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager' import StyleConfiguration, { IndexStyle } from './common/StyleConfiguration' import StyleManager from './common/StyleManager' import ControlCenterComponent from './control' diff --git a/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets b/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets index 624ef0c8..b273d147 100644 --- a/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets +++ b/product/pc/notificationpanel/src/main/ets/pages/bannerNotification.ets @@ -14,12 +14,12 @@ */ import Log from '../../../../../../../common/src/main/ets/default/Log'; -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilitymanager'; -import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/windowmanager'; -import EventManager, {unsubscribe} from "../../../../../../../common/src/main/ets/default/event/eventmanager"; -import BannerNotification from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeitem/view/item/bannernotificationitem'; -import NotificationViewModel from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeitem/viewmodel/NotificationViewModel'; -import NotificationConstants, { ScreenLockStatus } from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeitem/common/constants'; +import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; +import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/WindowManager'; +import EventManager, {unsubscribe} from "../../../../../../../common/src/main/ets/default/event/EventManager"; +import BannerNotification from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/bannerNotificationItem'; +import NotificationViewModel from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/viewmodel/NotificationViewModel'; +import NotificationConstants, { ScreenLockStatus } from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/common/constants'; const TAG = 'NotificationPanel-BannerNotification'; const TRANSLATE_SIZE = '382vp'; diff --git a/product/pc/notificationpanel/src/main/ets/pages/notification.ets b/product/pc/notificationpanel/src/main/ets/pages/notification.ets index 6d2f62d2..d8a1fb9f 100644 --- a/product/pc/notificationpanel/src/main/ets/pages/notification.ets +++ b/product/pc/notificationpanel/src/main/ets/pages/notification.ets @@ -15,10 +15,10 @@ import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import Log from '../../../../../../../common/src/main/ets/default/Log' -import EventManager from "../../../../../../../common/src/main/ets/default/event/eventmanager" -import {obtainStartAbility} from "../../../../../../../common/src/main/ets/default/event/eventutil" -import NotificationListComponent from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeitem/view/notificationlistcomponent' -import NotificationViewModel from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeitem/viewmodel/NotificationViewModel' +import EventManager from "../../../../../../../common/src/main/ets/default/event/EventManager" +import {obtainStartAbility} from "../../../../../../../common/src/main/ets/default/event/EventUtil" +import NotificationListComponent from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/view/NotificationListComponent' +import NotificationViewModel from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/viewmodel/NotificationViewModel' const TAG = 'NotificationPanel-notification' const NO_NOTIFICATION_TOP_MARGIN = 40; diff --git a/product/pc/statusbar/src/main/ets/pages/common/StatusbarConfig.ts b/product/pc/statusbar/src/main/ets/pages/common/StatusbarConfig.ts index 2baf10c4..cea41f24 100644 --- a/product/pc/statusbar/src/main/ets/pages/common/StatusbarConfig.ts +++ b/product/pc/statusbar/src/main/ets/pages/common/StatusbarConfig.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { FASlotName } from '../../../../../../../../common/src/main/ets/default/constants'; +import { FASlotName } from '../../../../../../../../common/src/main/ets/default/Constants'; import { StatusBarConfig } from '../../../../../../../../features/statusbarcomponent/src/main/ets/com/ohos/common/Constants'; diff --git a/product/pc/statusbar/src/main/ets/pages/common/StyleManager.ts b/product/pc/statusbar/src/main/ets/pages/common/StyleManager.ts index 7dcb0537..f5d6392d 100644 --- a/product/pc/statusbar/src/main/ets/pages/common/StyleManager.ts +++ b/product/pc/statusbar/src/main/ets/pages/common/StyleManager.ts @@ -13,17 +13,17 @@ * limitations under the License. */ import Log from '../../../../../../../../common/src/main/ets/default/Log'; -import AbilityManager from '../../../../../../../../common/src/main/ets/default/abilitymanager/abilitymanager'; -import CommonStyleConfiguration from '../../../../../../../../common/src/main/ets/default/styleconfiguration'; -import StatusBarStyleConfiguration from '../../../../../../../../features/statusbarcomponent/src/main/ets/com/ohos/common/styleconfiguration'; -import BatteryStyleConfiguration from '../../../../../../../../features/batterycomponent/src/main/ets/default/common/styleconfiguration'; -import ClockStyleConfiguration from '../../../../../../../../features/clockcomponent/src/main/ets/default/common/styleconfiguration'; -import WifiStyleConfiguration from '../../../../../../../../features/wificomponent/src/main/ets/default/common/styleconfiguration'; -import BluetoothStyleConfiguration from '../../../../../../../../features/bluetoothcomponent/src/main/ets/com/ohos/common/styleconfiguration'; -import SignalStyleConfiguration from '../../../../../../../../features/signalcomponent/src/main/ets/default/common/styleconfiguration'; -import CapsuleStyleConfiguration from '../../../../../../../../features/capsulecomponent/src/main/ets/default/common/styleconfiguration'; -import LocationStyleConfiguration from '../../../../../../../../features/locationcomponent/src/main/ets/com/ohos/common/styleconfiguration'; -import RingModeStyleConfiguration from '../../../../../../../../features/ringmodecomponent/src/main/ets/com/ohos/common/styleconfiguration'; +import AbilityManager from '../../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; +import CommonStyleConfiguration from '../../../../../../../../common/src/main/ets/default/StyleConfiguration'; +import StatusBarStyleConfiguration from '../../../../../../../../features/statusbarcomponent/src/main/ets/com/ohos/common/StyleConfiguration'; +import BatteryStyleConfiguration from '../../../../../../../../features/batterycomponent/src/main/ets/default/common/StyleConfiguration'; +import ClockStyleConfiguration from '../../../../../../../../features/clockcomponent/src/main/ets/default/common/StyleConfiguration'; +import WifiStyleConfiguration from '../../../../../../../../features/wificomponent/src/main/ets/default/common/StyleConfiguration'; +import BluetoothStyleConfiguration from '../../../../../../../../features/bluetoothcomponent/src/main/ets/com/ohos/common/StyleConfiguration'; +import SignalStyleConfiguration from '../../../../../../../../features/signalcomponent/src/main/ets/default/common/StyleConfiguration'; +import CapsuleStyleConfiguration from '../../../../../../../../features/capsulecomponent/src/main/ets/default/common/StyleConfiguration'; +import LocationStyleConfiguration from '../../../../../../../../features/locationcomponent/src/main/ets/com/ohos/common/StyleConfiguration'; +import RingModeStyleConfiguration from '../../../../../../../../features/ringmodecomponent/src/main/ets/com/ohos/common/StyleConfiguration'; const TAG = './styleconfigurationer'; diff --git a/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets b/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets index 475d8257..7db30670 100644 --- a/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets +++ b/product/phone/dropdownpanel/src/main/ets/pages/bannerNotification.ets @@ -14,12 +14,12 @@ */ import Log from '../../../../../../../common/src/main/ets/default/Log'; -import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilitymanager'; -import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/windowmanager'; -import EventManager, {unsubscribe} from "../../../../../../../common/src/main/ets/default/event/eventmanager"; -import BannerNotification from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeitem/view/item/bannernotificationitem'; -import NotificationViewModel from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeitem/viewmodel/NotificationViewModel'; -import NotificationConstants, { ScreenLockStatus } from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeitem/common/constants'; +import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; +import WindowManager, { WindowType } from '../../../../../../../common/src/main/ets/default/WindowManager'; +import EventManager, {unsubscribe} from "../../../../../../../common/src/main/ets/default/event/EventManager"; +import BannerNotification from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/bannerNotificationItem'; +import NotificationViewModel from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/viewmodel/NotificationViewModel'; +import NotificationConstants, { ScreenLockStatus } from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/common/constants'; const TAG = 'DropdownPanel-BannerNotification'; const TRANSLATE_SIZE = '382vp'; diff --git a/product/phone/dropdownpanel/src/main/ets/pages/common/StyleManager.ts b/product/phone/dropdownpanel/src/main/ets/pages/common/StyleManager.ts index 50fb8052..4cb60bd1 100644 --- a/product/phone/dropdownpanel/src/main/ets/pages/common/StyleManager.ts +++ b/product/phone/dropdownpanel/src/main/ets/pages/common/StyleManager.ts @@ -13,11 +13,11 @@ * limitations under the License. */ import Log from '../../../../../../../../common/src/main/ets/default/Log'; -import AbilityManager from '../../../../../../../../common/src/main/ets/default/abilitymanager/abilitymanager'; -import CommonTemplateStyleConfiguration from '../../../../../../../../common/src/main/ets/template/common/styleconfiguration'; -import ControlCenterStyleConfiguration from '../../../../../../../../features/controlcentercomponent/src/main/ets/com/ohos/common/styleconfiguration'; -import BrightnessStyleConfiguration from '../../../../../../../../features/brightnesscomponent/src/main/ets/default/common/styleconfiguration'; -import RingModeStyleConfiguration from '../../../../../../../../features/ringmodecomponent/src/main/ets/com/ohos/common/styleconfiguration'; +import AbilityManager from '../../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; +import CommonTemplateStyleConfiguration from '../../../../../../../../common/src/main/ets/template/common/StyleConfiguration'; +import ControlCenterStyleConfiguration from '../../../../../../../../features/controlcentercomponent/src/main/ets/com/ohos/common/StyleConfiguration'; +import BrightnessStyleConfiguration from '../../../../../../../../features/brightnesscomponent/src/main/ets/default/common/StyleConfiguration'; +import RingModeStyleConfiguration from '../../../../../../../../features/ringmodecomponent/src/main/ets/com/ohos/common/StyleConfiguration'; const TAG = 'DropdownPanel-StyleManager'; diff --git a/product/phone/dropdownpanel/src/main/ets/pages/notification.ets b/product/phone/dropdownpanel/src/main/ets/pages/notification.ets index febb0489..0501dc91 100644 --- a/product/phone/dropdownpanel/src/main/ets/pages/notification.ets +++ b/product/phone/dropdownpanel/src/main/ets/pages/notification.ets @@ -16,22 +16,22 @@ import {isNfcAvailable} from '../../../../../../../common/src/main/ets/default/Constants'; import AbilityManager from '../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; import Log from '../../../../../../../common/src/main/ets/default/Log'; -import EventManager, { unsubscribe } from "../../../../../../../common/src/main/ets/default/event/eventmanager"; -import { obtainStartAbility } from "../../../../../../../common/src/main/ets/default/event/eventutil"; +import EventManager, { unsubscribe } from "../../../../../../../common/src/main/ets/default/event/EventManager"; +import { obtainStartAbility } from "../../../../../../../common/src/main/ets/default/event/EventUtil"; import Constants from './common/constants'; -import BatteryIcon from '../../../../../../../features/batterycomponent/src/main/ets/default/pages/batteryicon'; -import ClockIcon from '../../../../../../../features/clockcomponent/src/main/ets/default/pages/clockicon'; -import WifiIcon from '../../../../../../../features/wificomponent/src/main/ets/default/pages/wifiicon'; -import BluetoothIcon from '../../../../../../../features/bluetoothcomponent/src/main/ets/com/ohos/pages/statusbariconitembluetoothcomponent'; -import SignalIcon from '../../../../../../../features/signalcomponent/src/main/ets/default/pages/signalicon'; -import LocationIcon from '../../../../../../../features/locationcomponent/src/main/ets/com/ohos/pages/statusbariconitemlocationcomponent'; -import RingModeIcon from '../../../../../../../features/ringmodecomponent/src/main/ets/com/ohos/pages/statusbariconitemringmodecomponent'; +import BatteryIcon from '../../../../../../../features/batterycomponent/src/main/ets/default/pages/batteryIcon'; +import ClockIcon from '../../../../../../../features/clockcomponent/src/main/ets/default/pages/clockIcon'; +import WifiIcon from '../../../../../../../features/wificomponent/src/main/ets/default/pages/wifiIcon'; +import BluetoothIcon from '../../../../../../../features/bluetoothcomponent/src/main/ets/com/ohos/pages/StatusBarIconItemBluetoothComponent'; +import SignalIcon from '../../../../../../../features/signalcomponent/src/main/ets/default/pages/signalIcon'; +import LocationIcon from '../../../../../../../features/locationcomponent/src/main/ets/com/ohos/pages/StatusBarIconItemLocationComponent'; +import RingModeIcon from '../../../../../../../features/ringmodecomponent/src/main/ets/com/ohos/pages/StatusBarIconItemRingModeComponent'; import NfcIcon from '../../../../../../../features/nfccomponent/src/main/ets/com/ohos/pages/StatusBarIconItemNFComponent'; -import NotificationListComponent from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeitem/view/notificationlistcomponent'; -import NotificationViewModel from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeitem/viewmodel/NotificationViewModel'; +import NotificationListComponent from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/view/NotificationListComponent'; +import NotificationViewModel from '../../../../../../../features/noticeitem/src/main/ets/com/ohos/noticeItem/viewmodel/NotificationViewModel'; import ResourceUtil from '../../../../../../../common/src/main/ets/default/ResourceUtil'; import TimeManager, { TimeEventArgs, TIME_CHANGE_EVENT -} from '../../../../../../../common/src/main/ets/default/timemanager'; +} from '../../../../../../../common/src/main/ets/default/TimeManager'; import deviceInfo from '@ohos.deviceInfo'; const TAG = 'DropdownPanel-notification'; diff --git a/product/phone/dropdownpanel/src/main/ets/workers/PluginDataSourceWorker.js b/product/phone/dropdownpanel/src/main/ets/workers/PluginDataSourceWorker.js index 9cb540a3..c44b85c0 100644 --- a/product/phone/dropdownpanel/src/main/ets/workers/PluginDataSourceWorker.js +++ b/product/phone/dropdownpanel/src/main/ets/workers/PluginDataSourceWorker.js @@ -15,8 +15,8 @@ import worker from '@ohos.worker'; import Log from '../../../../../../../common/src/main/ets/default/Log'; -import PluginDataSourceManager from '../../../../../../../common/src/main/ets/plugindatasource/plugindatasourcemanager'; -import Constants, { obtainMsg } from '../../../../../../../common/src/main/ets/plugindatasource/common/constants'; +import PluginDataSourceManager from '../../../../../../../common/src/main/ets/plugindatasource/PluginDataSourceManager'; +import Constants, { obtainMsg } from '../../../../../../../common/src/main/ets/plugindatasource/common/Constants'; const parentPort = worker.parentPort; const TAG = `${parentPort.name} Worker`; diff --git a/product/phone/statusbar/src/main/ets/pages/common/StatusbarConfig.ts b/product/phone/statusbar/src/main/ets/pages/common/StatusbarConfig.ts index 8c025785..0c163355 100644 --- a/product/phone/statusbar/src/main/ets/pages/common/StatusbarConfig.ts +++ b/product/phone/statusbar/src/main/ets/pages/common/StatusbarConfig.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { FASlotName } from '../../../../../../../../common/src/main/ets/default/constants'; +import { FASlotName } from '../../../../../../../../common/src/main/ets/default/Constants'; import { StatusBarConfig } from '../../../../../../../../features/statusbarcomponent/src/main/ets/com/ohos/common/Constants'; diff --git a/product/phone/statusbar/src/main/ets/pages/common/StyleManager.ts b/product/phone/statusbar/src/main/ets/pages/common/StyleManager.ts index abb1ebf5..f201dcb0 100644 --- a/product/phone/statusbar/src/main/ets/pages/common/StyleManager.ts +++ b/product/phone/statusbar/src/main/ets/pages/common/StyleManager.ts @@ -13,7 +13,7 @@ * limitations under the License. */ import Log from '../../../../../../../../common/src/main/ets/default/Log'; -import AbilityManager from '../../../../../../../../common/src/main/ets/default/abilitymanager/abilitymanager'; +import AbilityManager from '../../../../../../../../common/src/main/ets/default/abilitymanager/abilityManager'; const TAG = 'StatusBar-StyleManager';