|
|
@@ -377,9 +377,9 @@ export struct LocalMusic {
|
|
|
.setOnRightClickListener(() => {
|
|
|
this.showSheelDialog()
|
|
|
})
|
|
|
- .setOnTitleClickListener(() => {
|
|
|
- this.showPupDialog()
|
|
|
- })
|
|
|
+ // .setOnTitleClickListener(() => {
|
|
|
+ // this.showPupDialog()
|
|
|
+ // })
|
|
|
.setOnLeftClickListener(() => {
|
|
|
this.doSwipBack()
|
|
|
})
|
|
|
@@ -917,7 +917,7 @@ export struct LocalMusic {
|
|
|
// Utility.doSortListAscending(directories)
|
|
|
|
|
|
} else {
|
|
|
- if (this.currentPath === this.lockPath) {
|
|
|
+ if (this.currentPath === this.lockPath&&Utility.isMeidaByExtension(path)) {
|
|
|
let item: VideoItem =
|
|
|
await Utility.uriGetMusicAssetsFromFile(this.context, path, CommonConstants.TYPE_LOCAL, false);
|
|
|
if (!path.endsWith('.lrc') && Utility.isMeidaByExtension(path) && !path.endsWith('.srt')) {
|
|
|
@@ -2741,7 +2741,6 @@ export struct LocalMusic {
|
|
|
|
|
|
@State currentTitleName: string = '' //点击歌单,艺术家,专辑进去后的标题
|
|
|
@State currentTitleCover: string | ResourceStr = '' //点击歌单,艺术家,专辑进去后的封面
|
|
|
- @State currentYear:string = ''
|
|
|
isShowCoverHeader() {
|
|
|
if (!this.isShowHeader) {
|
|
|
return false
|
|
|
@@ -3125,8 +3124,11 @@ export struct LocalMusic {
|
|
|
if (this.isFavMusic) {
|
|
|
this.getFavList(true)
|
|
|
} else {
|
|
|
- this.deleteCache(this.currentPath)
|
|
|
- this.getSortedFiles(this.currentPath)
|
|
|
+ if(this.modeType == 0){
|
|
|
+ this.asyncCurrentPathData()
|
|
|
+ }else if(this.modeType ==1){
|
|
|
+ workerInstance.postMessage({ code: 2, data: this.context });
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
|
|
|
@@ -3449,8 +3451,8 @@ export struct LocalMusic {
|
|
|
.animation({ duration: 500, curve: Curve.Ease }))
|
|
|
// .margin({ bottom: this.isCoverOpacity() ? 80 : 175 })
|
|
|
.margin({
|
|
|
- bottom: this.isCoverOpacity() ? (this.isShowCoverHeader() ? 45 : 80)
|
|
|
- : (this.isShowCoverHeader() ? 95 : 178)
|
|
|
+ bottom: this.isCoverOpacity() ? (this.isShowCoverHeader() ? this.topBarHeight+30 : this.topBarHeight+90)
|
|
|
+ : (this.isShowCoverHeader() ? this.topBarHeight+45 : this.topBarHeight+128)
|
|
|
})
|
|
|
.layoutWeight(1)
|
|
|
.scrollBar(BarState.Off)
|
|
|
@@ -4085,8 +4087,8 @@ export struct LocalMusic {
|
|
|
}))
|
|
|
// .divider({ strokeWidth: 1, color: this.isDarkMode? '#333333':'#ffe9f0f0' })
|
|
|
.margin({
|
|
|
- bottom: this.isCoverOpacity() ? (this.isShowCoverHeader() ? 25 : 80)
|
|
|
- : (this.isShowCoverHeader() ? 85 : this.isHiCarSmall()?140:175)
|
|
|
+ bottom: this.isCoverOpacity() ? (this.isShowCoverHeader() ? this.topBarHeight+25 : this.topBarHeight+80)
|
|
|
+ : (this.isShowCoverHeader() ? this.topBarHeight+35 : this.isHiCarSmall()?this.topBarHeight+90:this.topBarHeight+125)
|
|
|
})
|
|
|
.cachedCount(6)
|
|
|
.borderRadius(20)
|
|
|
@@ -4398,7 +4400,6 @@ export struct LocalMusic {
|
|
|
this.isCanBack = true
|
|
|
this.titleBarModel.setTitleName(item.name)
|
|
|
this.currentTitleName = '专辑:' + item.name
|
|
|
- this.currentYear = '发行时间:' + albumList[0].year
|
|
|
if (item.pixelMapPath) {
|
|
|
this.currentTitleCover = item.pixelMapPath
|
|
|
}
|
|
|
@@ -4406,6 +4407,10 @@ export struct LocalMusic {
|
|
|
this.titleBarModel.setLeftIconMain($r('app.media.left_back_white'))
|
|
|
this.mScrollMap.set(item.name, this.selectedIndex)
|
|
|
}
|
|
|
+ //进入歌单的时候的滚动位置在顶部
|
|
|
+ if (this.isGridMusic) {
|
|
|
+ this.scroller.scrollToIndex(0)
|
|
|
+ }
|
|
|
|
|
|
break;
|
|
|
case CommonConstants.TYPE_IS_CSJAD:
|