openharmony/applications_app_samples
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_app_samples synced 2024-12-04 07:22:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!4950 【4.1Release】【Sample】MusicAlbum小窗显示异常修复

Browse Source 
Merge pull request !4950 from YangXin/OpenHarmony-4.1-Release
This commit is contained in:
openharmony_ci 2024-11-22 03:05:44 +00:00 committed by Gitee
commit 9688557b71
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/SuperFeature/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/Content.ets
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
@ -22,7 +22,7 @@ export default struct Content {
build() { build() {
GridRow() { GridRow() {
GridCol({ span: { sm: 12, md: 6, lg: 4 } }) { GridCol({ span: { xs:12, sm: 12, md: 6, lg: 4 } }) {
PlayListCover() PlayListCover()
.onAreaChange((oldArea: Area, newArea: Area) => { .onAreaChange((oldArea: Area, newArea: Area) => {
this.coverHeight = newArea.height as number this.coverHeight = newArea.height as number
@ -30,7 +30,7 @@ export default struct Content {
} }
.backgroundColor('#e4ecf7') .backgroundColor('#e4ecf7')
GridCol({ span: { sm: 12, md: 6, lg: 8 } }) { GridCol({ span: { xs:12, sm: 12, md: 6, lg: 8 } }) {
PlayList() PlayList()
} }
.borderRadius(40) .borderRadius(40)

14
code/SuperFeature/MultiDeviceAppDev/MusicAlbum/entry/src/main/ets/common/PlayListCover.ets
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
@ -100,15 +100,15 @@ export default struct PlayListCover {
if (this.currentBreakpoint === 'sm') { if (this.currentBreakpoint === 'sm') {
Column() { Column() {
GridRow() { GridRow() {
GridCol({ span: { sm: 4, md: 10 }, offset: { sm: 0, md: 1, lg: 1 } }) { GridCol({ span: { xs: 4, sm: 4, md: 10 }, offset: { xs: 0, sm: 0, md: 1, lg: 1 } }) {
this.CoverImage() this.CoverImage()
} }
GridCol({ span: { sm: 8, md: 10 }, offset: { sm: 0, md: 2, lg: 2 } }) { GridCol({ span: { xs: 8, sm: 8, md: 10 }, offset: { xs: 0, sm: 0, md: 2, lg: 2 } }) {
this.CoverIntroduction() this.CoverIntroduction()
} }
GridCol({ span: { sm: 12, md: 10 }, offset: { sm: 0, md: 2, lg: 2 } }) { GridCol({ span: { xs: 12, sm: 12, md: 10 }, offset: { xs: 0, sm: 0, md: 2, lg: 2 } }) {
this.CoverOptions() this.CoverOptions()
} }
} }
@ -118,15 +118,15 @@ export default struct PlayListCover {
} else { } else {
Column() { Column() {
GridRow() { GridRow() {
GridCol({ span: { sm: 4, md: 10 }, offset: { sm: 0, md: 1, lg: 1 } }) { GridCol({ span: { xs: 4, sm: 4, md: 10 }, offset: { xs: 0, sm: 0, md: 1, lg: 1 } }) {
this.CoverImage() this.CoverImage()
} }
GridCol({ span: { sm: 8, md: 10 }, offset: { sm: 0, md: 2, lg: 2 } }) { GridCol({ span: { xs: 8, sm: 8, md: 10 }, offset: { xs: 0, sm: 0, md: 2, lg: 2 } }) {
this.CoverIntroduction() this.CoverIntroduction()
} }
GridCol({ span: { sm: 12, md: 10 }, offset: { sm: 0, md: 2, lg: 2 } }) { GridCol({ span: { xs: 12, sm: 12, md: 10 }, offset: { xs: 0, sm: 0, md: 2, lg: 2 } }) {
this.CoverOptions() this.CoverOptions()
}.margin({ }.margin({
top: this.currentBreakpoint === 'sm' ? 15 : 0, top: this.currentBreakpoint === 'sm' ? 15 : 0,

8
code/SuperFeature/MultiDeviceAppDev/MusicAlbum/hvigor/hvigor-config.json5
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2023 Huawei Device Co., Ltd. * Copyright (c) 2023-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
@ -14,8 +14,8 @@
*/ */
{ {
"hvigorVersion": "2.0.0", "hvigorVersion": "2.4.2",
"dependencies": { "dependencies": {
"@ohos/hvigor-ohos-plugin": "2.0.0" "@ohos/hvigor-ohos-plugin": "2.4.2"
} }
} }