|
|
@@ -17,6 +17,7 @@ import {
|
|
|
StrUtil,
|
|
|
ToastUtil
|
|
|
} from '@pura/harmony-utils';
|
|
|
+import { imagePathToPixelMap } from '../common/util/CommUtils';
|
|
|
import { unifiedDataChannel, uniformDataStruct, uniformTypeDescriptor } from '@kit.ArkData';
|
|
|
import { CommonConstants } from '../common/constants/CommonConstants';
|
|
|
import Logger from '../common/util/Logger';
|
|
|
@@ -7356,7 +7357,7 @@ export struct LocalMusic {
|
|
|
|
|
|
@State imageLabel: PixelMap | Resource = CommonConstants.musicBgList[0];
|
|
|
@State imageLabelBg: PixelMap | Resource = CommonConstants.musicBgList[0];
|
|
|
- @State rotateAngle2: number = 0
|
|
|
+ @State rotateAngle2: number = -9
|
|
|
@StorageLink('imageColor') imageColor: string = 'rgba(0, 0, 2, 1.00)';
|
|
|
@State cover: string | undefined = '';
|
|
|
@State artist: string | undefined = ''
|
|
|
@@ -7826,7 +7827,7 @@ export struct LocalMusic {
|
|
|
if (cover === undefined) {
|
|
|
return;
|
|
|
}
|
|
|
- ImageUtil.imagePathToPixelMap(cover).then((value) => {
|
|
|
+ imagePathToPixelMap(cover).then((value) => {
|
|
|
let headFilter = effectKit.createEffect(value);
|
|
|
if (headFilter !== null) {
|
|
|
headFilter.blur(15);
|
|
|
@@ -7888,7 +7889,7 @@ export struct LocalMusic {
|
|
|
iterations: 1,
|
|
|
curve: Curve.Linear
|
|
|
}, () => {
|
|
|
- this.rotateAngle2 = 0
|
|
|
+ this.rotateAngle2 = -9
|
|
|
})
|
|
|
}
|
|
|
|
|
|
@@ -7921,7 +7922,7 @@ export struct LocalMusic {
|
|
|
curve: Curve.Linear,
|
|
|
iterations: 1,
|
|
|
}, () => {
|
|
|
- this.rotateAngle2 = -40;
|
|
|
+ this.rotateAngle2 = -45;
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -8433,7 +8434,6 @@ export struct LocalMusic {
|
|
|
.onClick(async () => {
|
|
|
this.setLoopMode()
|
|
|
|
|
|
-
|
|
|
})
|
|
|
|
|
|
|
|
|
@@ -8566,7 +8566,7 @@ export struct LocalMusic {
|
|
|
Image($r('app.media.ic_music_disc'))
|
|
|
.width(245)
|
|
|
.height(245)
|
|
|
- .margin({ right: 20, left: 20 })
|
|
|
+ .margin({ right: 20, left: 20 ,top:this.isCoverRectangle||this.isLandscape?0:43})
|
|
|
.aspectRatio(1)
|
|
|
.opacity(this.isCoverOpacity() || this.isCoverRectangle ? 0 : 1)
|
|
|
.visibility(this.isCoverOpacity() || this.isCoverRectangle ? Visibility.None : Visibility.Visible)
|
|
|
@@ -8619,7 +8619,7 @@ export struct LocalMusic {
|
|
|
(this.isCoverOpacity() ? (px2vp(this.windowHeight)*0.62) : this.isCoverRectangle ? 320 : 162))
|
|
|
.objectFit(this.isCoverRectangle ? ImageFit.Contain : ImageFit.Auto)
|
|
|
.alt(this.imageLabel)
|
|
|
- .margin({ right: 20, left: 20 })
|
|
|
+ .margin({ right: 20, left: 20,top:this.isCoverRectangle||this.isLandscape?0:43 })
|
|
|
.aspectRatio(1)
|
|
|
.opacity(this.opacityValueImage)
|
|
|
.scale({ x: this.scaleValueImage, y: this.scaleValueImage }) // 添加缩放效果
|