From 56f653173b4e868f2ad8524fbdd9e2402c76641d Mon Sep 17 00:00:00 2001 From: fangzheng24 Date: Tue, 31 Jan 2023 11:25:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=9C=80=E6=96=B0sdk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fangzheng24 --- entry/src/main/ets/Application/AbilityStage.ts | 2 +- entry/src/main/ets/MainAbility/MainAbility.ts | 2 +- .../ets/com/ohos/noticeItem/common/CommonUtil.ts | 2 +- .../ets/com/ohos/noticeItem/view/item/groupItem.ets | 2 +- .../ohos/noticeItem/view/item/notificationItem.ets | 2 +- .../main/ets/com/ohos/view/component/wallpaper.ets | 13 ++++++++----- product/pc/src/main/ets/Application/AbilityStage.ts | 2 +- .../main/ets/ServiceExtAbility/ServiceExtAbility.ts | 2 +- product/pc/src/main/ets/pages/slidescreenlock.ets | 4 +--- .../phone/src/main/ets/Application/AbilityStage.ts | 2 +- .../main/ets/ServiceExtAbility/ServiceExtAbility.ts | 2 +- .../phone/src/main/ets/pages/slidescreenlock.ets | 4 +--- 12 files changed, 19 insertions(+), 20 deletions(-) diff --git a/entry/src/main/ets/Application/AbilityStage.ts b/entry/src/main/ets/Application/AbilityStage.ts index 577fcde..78dd564 100644 --- a/entry/src/main/ets/Application/AbilityStage.ts +++ b/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage"; +import AbilityStage from "@ohos.app.ability.AbilityStage"; import Log from '../../../../../common/src/main/ets/default/Log'; const TAG = "Entry_AbilityStage"; diff --git a/entry/src/main/ets/MainAbility/MainAbility.ts b/entry/src/main/ets/MainAbility/MainAbility.ts index 0478f1c..087cfb4 100644 --- a/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import Log from '../../../../../common/src/main/ets/default/Log'; const TAG = "Entry_MainAbility"; diff --git a/features/noticeitem/src/main/ets/com/ohos/noticeItem/common/CommonUtil.ts b/features/noticeitem/src/main/ets/com/ohos/noticeItem/common/CommonUtil.ts index f572af9..be6255b 100644 --- a/features/noticeitem/src/main/ets/com/ohos/noticeItem/common/CommonUtil.ts +++ b/features/noticeitem/src/main/ets/com/ohos/noticeItem/common/CommonUtil.ts @@ -19,7 +19,7 @@ import WantAgent from '@ohos.wantAgent'; const TAG = 'CommonUtil'; const DEFAULT_INFO = { code: 0, - want: '', + want: {}, permission: '', extraInfo: {} }; diff --git a/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/groupItem.ets b/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/groupItem.ets index 12ee8e4..964c336 100644 --- a/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/groupItem.ets +++ b/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/groupItem.ets @@ -81,7 +81,7 @@ export default struct GroupItem { .borderRadius($r("sys.float.ohos_id_corner_radius_default_l")) .clip(true) .scrollable(ScrollDirection.Horizontal) - .scrollBar(BarState.On) + .scrollBar(BarState.Off) .onScroll(() => { let accuracy = 0.1 let newOpacity = this.mScroller.currentOffset().xOffset * 1.0 / getIconListSize() diff --git a/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/notificationItem.ets b/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/notificationItem.ets index bd61783..e6680e0 100644 --- a/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/notificationItem.ets +++ b/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/notificationItem.ets @@ -45,7 +45,7 @@ export default struct NotificationItem { } } .scrollable(ScrollDirection.Horizontal) - .scrollBar(BarState.On) + .scrollBar(BarState.Off) .onScroll(() => { let accuracy = 0.1 let newOpacity = this.mScroller.currentOffset().xOffset * 1.0 / getIconListSize() diff --git a/features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper.ets b/features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper.ets index 9d52c98..a2d3635 100644 --- a/features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper.ets +++ b/features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper.ets @@ -22,6 +22,7 @@ const TAG = 'ScreenLock-Wallpaper' @Component export default struct Wallpaper { @State mViewModel: ViewModel = new ViewModel() + @StorageLink('isWallpaperShow') isWallpaperShow: boolean = true aboutToAppear() { Log.showInfo(TAG, "aboutToAppear") @@ -34,10 +35,12 @@ export default struct Wallpaper { } build() { - Image(this.mViewModel.getWallpaperData()) - .width(Constants.FULL_CONTAINER_WIDTH) - .height(Constants.FULL_CONTAINER_HEIGHT) - .objectFit(ImageFit.Cover) - .hoverEffect(HoverEffect.None) + if (this.isWallpaperShow === true) { + Image(this.mViewModel.getWallpaperData()) + .width(Constants.FULL_CONTAINER_WIDTH) + .height(Constants.FULL_CONTAINER_HEIGHT) + .objectFit(ImageFit.Cover) + .hoverEffect(HoverEffect.None) + } } } \ No newline at end of file diff --git a/product/pc/src/main/ets/Application/AbilityStage.ts b/product/pc/src/main/ets/Application/AbilityStage.ts index 7df13e6..a68556f 100644 --- a/product/pc/src/main/ets/Application/AbilityStage.ts +++ b/product/pc/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" import Log from '../../../../../../common/src/main/ets/default/Log' const TAG = "ScreenLock-MainAbilityStage" diff --git a/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index d10d51a..34e846b 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import ServiceExtension from '@ohos.application.ServiceExtensionAbility' +import ServiceExtension from '@ohos.app.ability.ServiceExtensionAbility' import windowManager from '@ohos.window' import WindowManagers, { WindowType } from "../../../../../../common/src/main/ets/default/WindowManager"; import display from '@ohos.display' diff --git a/product/pc/src/main/ets/pages/slidescreenlock.ets b/product/pc/src/main/ets/pages/slidescreenlock.ets index 76016cd..dacad49 100644 --- a/product/pc/src/main/ets/pages/slidescreenlock.ets +++ b/product/pc/src/main/ets/pages/slidescreenlock.ets @@ -57,9 +57,7 @@ export default struct SlideScreenlock { build() { Stack({ alignContent: Alignment.Bottom }) { Column() { - if (this.isWallpaperShow === true) { - Wallpaper() - } + Wallpaper() } .backgroundColor($r('app.color.screenlock_backgroundcolor')) .width(Constants.FULL_CONTAINER_WIDTH) diff --git a/product/phone/src/main/ets/Application/AbilityStage.ts b/product/phone/src/main/ets/Application/AbilityStage.ts index ef2476e..8638522 100644 --- a/product/phone/src/main/ets/Application/AbilityStage.ts +++ b/product/phone/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/product/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 5bec2b2..62b71eb 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import ServiceExtension from '@ohos.application.ServiceExtensionAbility' +import ServiceExtension from '@ohos.app.ability.ServiceExtensionAbility' import windowManager from '@ohos.window' import display from '@ohos.display' import Log from '../../../../../../common/src/main/ets/default/Log' diff --git a/product/phone/src/main/ets/pages/slidescreenlock.ets b/product/phone/src/main/ets/pages/slidescreenlock.ets index ea71598..9dcb0f9 100644 --- a/product/phone/src/main/ets/pages/slidescreenlock.ets +++ b/product/phone/src/main/ets/pages/slidescreenlock.ets @@ -54,9 +54,7 @@ export default struct SlideScreenlock { build() { Stack({ alignContent: Alignment.Bottom }) { Column() { - if (this.isWallpaperShow === true) { - Wallpaper() - } + Wallpaper() } .backgroundColor($r('app.color.screenlock_backgroundcolor')) .width(Constants.FULL_CONTAINER_WIDTH)