From 97166056af1617ac868fa3dbc4a4d1c29f52ccfc Mon Sep 17 00:00:00 2001 From: sunlian Date: Mon, 22 Jan 2024 14:25:42 +0800 Subject: [PATCH] test pr Signed-off-by: sunlian --- .../src/main/ets/manager/PlayerManager.ets | 8 +- .../entry/src/main/ets/view/BookFirstItem.ets | 2 +- .../src/main/ets/view/BookSecondItem.ets | 2 +- .../entry/src/main/ets/view/BookTriItem.ets | 2 +- .../src/main/ets/view/ListHistoryItem.ets | 2 +- .../entry/src/main/ets/view/MidItem.ets | 2 +- .../entry/src/main/ets/view/PlayerDetail.ets | 77 +++++++++++++++---- .../entry/src/main/ets/view/TriItem.ets | 2 +- 8 files changed, 73 insertions(+), 24 deletions(-) diff --git a/scenario/arkui/MyMusic/entry/src/main/ets/manager/PlayerManager.ets b/scenario/arkui/MyMusic/entry/src/main/ets/manager/PlayerManager.ets index c3b08a47..0d49c6e8 100644 --- a/scenario/arkui/MyMusic/entry/src/main/ets/manager/PlayerManager.ets +++ b/scenario/arkui/MyMusic/entry/src/main/ets/manager/PlayerManager.ets @@ -23,6 +23,7 @@ export default class PlayerManager { private currentTime: number = 0; private item: AudioItem = new AudioItem('', $r('app.media.ic_gallery_frame_overlay_soundphoto'), '', 0); private list: AudioItem[] = []; + private listTitle: string = ''; private listPosition: number = 0; private intervalID: number = -1; private innerEvent: emitter.InnerEvent = { @@ -36,7 +37,7 @@ export default class PlayerManager { /** * 初始化 */ - playList(list: AudioItem[], pos: number): void { + playList(listTitle:string, list: AudioItem[], pos: number): void { this.stop(); if (list.length <= 0) { Logger.error(this.tag, 'PlayList:' + 'list length <= 0'); @@ -52,6 +53,7 @@ export default class PlayerManager { this.currentTime = 0; this.item = list[this.listPosition]; this.state = 0; + this.listTitle = listTitle; this.play(); } @@ -190,4 +192,8 @@ export default class PlayerManager { getItem(): AudioItem { return this.item; } + + getListTitle():string{ + return this.listTitle; + } } diff --git a/scenario/arkui/MyMusic/entry/src/main/ets/view/BookFirstItem.ets b/scenario/arkui/MyMusic/entry/src/main/ets/view/BookFirstItem.ets index e88ec4bb..6ddaf8f0 100644 --- a/scenario/arkui/MyMusic/entry/src/main/ets/view/BookFirstItem.ets +++ b/scenario/arkui/MyMusic/entry/src/main/ets/view/BookFirstItem.ets @@ -45,7 +45,7 @@ export default struct BookFirstItem { prompt.showToast({ message: '播放歌单：' + this.item.title }) - this.playerManager.playList(this.item.list, 0); + this.playerManager.playList(this.item.title, this.item.list, 0); }) } } \ No newline at end of file diff --git a/scenario/arkui/MyMusic/entry/src/main/ets/view/BookSecondItem.ets b/scenario/arkui/MyMusic/entry/src/main/ets/view/BookSecondItem.ets index 4b8fa3ab..37376657 100644 --- a/scenario/arkui/MyMusic/entry/src/main/ets/view/BookSecondItem.ets +++ b/scenario/arkui/MyMusic/entry/src/main/ets/view/BookSecondItem.ets @@ -42,7 +42,7 @@ export default struct BookSecondItem { prompt.showToast({ message: '播放歌单：' + this.item.title }) - this.playerManager.playList(this.item.list, 0); + this.playerManager.playList(this.item.title, this.item.list, 0); }) } } \ No newline at end of file diff --git a/scenario/arkui/MyMusic/entry/src/main/ets/view/BookTriItem.ets b/scenario/arkui/MyMusic/entry/src/main/ets/view/BookTriItem.ets index 3badefc5..45b0538c 100644 --- a/scenario/arkui/MyMusic/entry/src/main/ets/view/BookTriItem.ets +++ b/scenario/arkui/MyMusic/entry/src/main/ets/view/BookTriItem.ets @@ -78,7 +78,7 @@ export default struct BookTriItem { prompt.showToast({ message: '播放歌单：' + item.title }) - this.playerManager.playList(item.list, 0); + this.playerManager.playList(item.title, item.list, 0); }) }) } diff --git a/scenario/arkui/MyMusic/entry/src/main/ets/view/ListHistoryItem.ets b/scenario/arkui/MyMusic/entry/src/main/ets/view/ListHistoryItem.ets index 4689e247..56f5e470 100644 --- a/scenario/arkui/MyMusic/entry/src/main/ets/view/ListHistoryItem.ets +++ b/scenario/arkui/MyMusic/entry/src/main/ets/view/ListHistoryItem.ets @@ -55,6 +55,6 @@ export default struct ListHistoryItem { prompt.showToast({ message: '播放歌单：' + this.item.title.replace(' ', '') }) - this.playerManager.playList(this.item.list,0) + this.playerManager.playList(this.item.title, this.item.list,0) } } \ No newline at end of file diff --git a/scenario/arkui/MyMusic/entry/src/main/ets/view/MidItem.ets b/scenario/arkui/MyMusic/entry/src/main/ets/view/MidItem.ets index 9d80bbc4..83166d12 100644 --- a/scenario/arkui/MyMusic/entry/src/main/ets/view/MidItem.ets +++ b/scenario/arkui/MyMusic/entry/src/main/ets/view/MidItem.ets @@ -102,6 +102,6 @@ export default struct MidItem { prompt.showToast({ message: '播放歌单：' + this.item.title.replace(' ', '') }) - this.playerManager.playList(this.item.list,0) + this.playerManager.playList(this.item.title, this.item.list,0) } } \ No newline at end of file diff --git a/scenario/arkui/MyMusic/entry/src/main/ets/view/PlayerDetail.ets b/scenario/arkui/MyMusic/entry/src/main/ets/view/PlayerDetail.ets index 9da4d580..5084ce72 100644 --- a/scenario/arkui/MyMusic/entry/src/main/ets/view/PlayerDetail.ets +++ b/scenario/arkui/MyMusic/entry/src/main/ets/view/PlayerDetail.ets @@ -26,9 +26,10 @@ import Logger from '../common/utils/Logger'; export default struct PlayerDetail { private tag: string = 'PlayerDetail'; private playerManager: PlayerManager = AppStorage.get('playerManager') as PlayerManager; - @State playingTitle: string = this.playerManager.getItem().title - @State playingArtist: string = this.playerManager.getItem().artist - @State playingImg: Resource = this.playerManager.getItem().img + @State playingTitle: string = this.playerManager.getItem().title; + @State listTitle: string = this.playerManager.getListTitle(); + @State playingArtist: string = this.playerManager.getItem().artist; + @State playingImg: Resource = this.playerManager.getItem().img; @State durationTime: number = this.playerManager.getItem().time; // 总时长 @State currentTime: number = 0; // 当前时间 @State state: number = 0; // 播放状态 @@ -106,21 +107,29 @@ export default struct PlayerDetail { }) }) Column() { - Text(this.playingTitle).fontSize('18fp') - Row() { - Text(this.playingArtist).fontSize('14fp') - .fontColor('#a0a0a0') - Text('关注') - .fontSize('14fp') - .borderRadius('8vp') - .backgroundColor('#22a0a0a0') - .margin('4vp') - .padding({ right: '4vp', left: '4vp' }) - Image($r('app.media.ic_public_arrow_right_grey')) - .width('8vp') - .height('16vp') + if (this.contentSwitch) { + Text(this.listTitle).fontSize('18fp') + .maxLines(2) + } else { + Text(this.playingTitle).fontSize('18fp') + .maxLines(1) + Row() { + Text(this.playingArtist).fontSize('14fp') + .fontColor('#a0a0a0') + Text('关注') + .fontSize('14fp') + .borderRadius('8vp') + .backgroundColor('#22a0a0a0') + .margin('4vp') + .padding({ right: '4vp', left: '4vp' }) + Image($r('app.media.ic_public_arrow_right_grey')) + .width('8vp') + .height('16vp') + } } } + .justifyContent(FlexAlign.Center) + .height('80vp') .width('70%') Image($r('app.media.ic_public_share')) @@ -146,6 +155,40 @@ export default struct PlayerDetail { iterations: -1, // 设置-1表示动画无限循环 playMode: PlayMode.Normal }) + Row() { + Column() { + Text(this.playingTitle).fontSize('18fp') + Row() { + Text(this.playingArtist).fontSize('16fp') + .fontColor('#303030') + Text('关注') + .fontSize('14fp') + .fontColor('#303030') + .backgroundColor('#f0f0f0') + .borderRadius('6vp') + .padding({ left: '4vp', right: '4vp' }) + } + }.alignItems(HorizontalAlign.Start) + + Blank() + Stack() { + Image($r('app.media.ic_public_favor')) + .width('48vp') + .height('48vp') + Text('100w+').fontSize('10fp') + .backgroundColor('#ffffff') + }.alignContent(Alignment.TopEnd) + + Stack() { + Image($r('app.media.ic_public_comments')) + .width('48vp') + .height('48vp') + Text('10w+').fontSize('10fp') + .margin({ left: '32vp' }) + } + } + .width('90%') + .justifyContent(FlexAlign.SpaceBetween) }.width('100%') .height('100%') .onClick(() => { @@ -197,7 +240,7 @@ export default struct PlayerDetail { this.contentSwitch = true; if (this.state === 1) { this.rotateAngle = 0; - animateTo({ duration: 3600 }, ()=>{ + animateTo({ duration: 3600 }, () => { this.rotateAngle = 360; }) } diff --git a/scenario/arkui/MyMusic/entry/src/main/ets/view/TriItem.ets b/scenario/arkui/MyMusic/entry/src/main/ets/view/TriItem.ets index ec5fddc9..dd00f5d9 100644 --- a/scenario/arkui/MyMusic/entry/src/main/ets/view/TriItem.ets +++ b/scenario/arkui/MyMusic/entry/src/main/ets/view/TriItem.ets @@ -54,7 +54,7 @@ export default struct TriItem { prompt.showToast({ message: '播放歌单：' + item.title }) - this.playerManager.playList(item.list, 0); + this.playerManager.playList(item.title, item.list, 0); }) }) } -- Gitee