Parcourir la source

继续优化UI

onecold il y a 8 mois
Parent
commit
4c0c580a2c

+ 1 - 1
entry/src/main/ets/Constants.ets

@@ -34,7 +34,7 @@ export class Constants {
   public static readonly UNKNOWN_MIME_TYPE: string = 'audio/mpeg'
 
   // 默认封面
-  public static readonly COMMON_SONG_DEFAULT_IMAGE: ResourceStr = $r('app.media.music_red')
+  public static readonly COMMON_SONG_DEFAULT_IMAGE: ResourceStr = $r('app.media.alt')
 
   public static readonly  COMMON_BORDER_RADIUS: number = 8
   public static readonly  COMMON_HIGHLIGHT_COLOR: string = '#e45050'

+ 3 - 3
entry/src/main/ets/dialog/AddSongsToPlaylistDialog.ets

@@ -664,7 +664,7 @@ struct AddSongsToPlaylistDialogContent {
         // 全部歌曲模式
         if (this.dataSource.dataArray.length === 0 && this.isSearchMode) {
           Column({ space: 12 }) {
-            Image($r('app.media.music_red'))
+            Image($r('app.media.alt'))
               .width(64)
               .height(64)
               .opacity(0.3)
@@ -751,11 +751,11 @@ struct AddSongsToPlaylistDialogContent {
             ListItem() {
               Row({ space: 12 }) {
 
-                Image(StrUtil.isEmpty(song.pixelMapPath) ? $r('app.media.music_red') : song.pixelMapPath)
+                Image(StrUtil.isEmpty(song.pixelMapPath) ? $r('app.media.alt') : song.pixelMapPath)
                   .fillColor(StrUtil.isEmpty(song.pixelMapPath) ? (this.isDarkMode ? Color.White : this.themeColor) : undefined)
                   .height(40)
                   .width(40)
-                  .alt($r('app.media.music_red'))
+                  .alt($r('app.media.alt'))
                   .borderRadius('100%')
                   .clip(true)
                   .draggable(false)

+ 1 - 1
entry/src/main/ets/pages/ChartsCount.ets

@@ -332,7 +332,7 @@ export struct ChartsCount {
                 .width(75)
                 .height(70)
                 .borderRadius(8)
-                .alt($r('app.media.music_red'))
+                .alt($r('app.media.alt'))
                 .alignSelf(ItemAlign.Center)
                 .interpolation(ImageInterpolation.Medium)// 用于重采样后的抗锯齿
                 .autoResize(true) // 重采样,可减少内存占用

+ 2 - 2
entry/src/main/ets/pages/NewIndex.ets

@@ -584,10 +584,10 @@ struct NewIndex {
   playConLeft(isLeft: boolean = true) {
     Row() {
       Image( StrUtil.isNotEmpty(this.currentSong?.pixelMapPath)?
-        this.currentSong?.pixelMapPath:$r('app.media.music_red'))
+        this.currentSong?.pixelMapPath:$r('app.media.alt'))
         .height(48)
         .objectFit(ImageFit.Contain)
-        .alt( $r('app.media.music_red'))
+        .alt( $r('app.media.alt'))
         .fillColor(this.themeColor)
         .borderRadius(8)
         .shadow({

+ 2 - 2
entry/src/main/ets/pages/PlaylistDetailPage.ets

@@ -877,7 +877,7 @@ export struct PlaylistDetailPage {
                   Row() {
                     // 歌曲封面 - 改为圆形
                     Stack() {
-                      Image(song.pixelMapPath || $r('app.media.music_red'))
+                      Image(song.pixelMapPath || $r('app.media.alt'))
                         .width(48)
                         .height(48)
                         .borderRadius(24) // 改为圆形
@@ -1493,7 +1493,7 @@ export function emptyView(themeColor: string, isDarkMode: boolean = false) {
         .fill(themeColorWithAlpha(themeColor, 0.13, isDarkMode))
 
       // 音符图标
-      Image($r('app.media.music_red'))
+      Image($r('app.media.alt'))
         .width(64)
         .height(64)
         .opacity(0.6)

+ 0 - 39
entry/src/main/ets/pages/SettingPage.ets

@@ -164,7 +164,6 @@ export struct SettingPage {
   @State isCoverRectangle: boolean = false
   @State isSavePlayMode: boolean = true
   @State volumeSmall: boolean = false
-  @State isCoverTop: boolean = true
   @State isCoverTopBig: boolean = false//顶部大封面部分手机显示会和播放控制页重叠
   @State isSwipe: boolean = false //listItem的左滑开关
   @State isPlayListBgGrass: boolean = true//是否播放列表玻璃透明效果
@@ -281,7 +280,6 @@ export struct SettingPage {
     this.isMemoryLastPlay = PreferencesUtil.getBooleanSync(SettingPage.iS_MEMORY_LAST_PLAY, false)
     this.twoFingerType = PreferencesUtil.getNumberSync(SettingPage.TWO_FINGER_TYPE, 2)
     this.isCircleBtn = PreferencesUtil.getBooleanSync(SettingPage.IS_CIRCLE_BTN, true)
-    this.isCoverTop = PreferencesUtil.getBooleanSync(SettingPage.IS_COVER_TOP, true)
     this.isShowTitleBar = PreferencesUtil.getBooleanSync(SettingPage.IS_SHOW_TITLTBAR, false)
     this.isShowAllBar = PreferencesUtil.getBooleanSync(SettingPage.IS_SHOW_ALLBAR, true)
     this.isShowPlayPageBack = PreferencesUtil.getBooleanSync(SettingPage.IS_SHOW_PLAYPAGE_BACK, true)
@@ -1229,42 +1227,7 @@ export struct SettingPage {
             .clickEffect({ level: ClickEffectLevel.HEAVY })
 
             Line().width('100%').height(0.3).backgroundColor($r('app.color.index_tab_unselected_font_color'))
-            // 封面顶部
-            Row() {
-              SymbolGlyph($r('sys.symbol.arrowshape_up'))
-                .fontSize(20)
-                .fontColor([this.themeColor])
-                .alignSelf(ItemAlign.Center)
-                .margin({ left: 15 })
-              Text('封面顶部')
-                .margin({ left: 8 })
-                .fontSize(15)
-                .fontColor(Color.Gray)
-                .fontWeight(480)
-                .layoutWeight(1)
-              Toggle({ type: ToggleType.Switch, isOn: this.isCoverTop })
-                .selectedColor(this.themeColor)
-                .switchPointColor(Color.White)
-                .margin({ right: 18 })
-                .clickEffect({level:ClickEffectLevel.LIGHT, scale: 0.5})
-                .onChange((checked: boolean) => {
-                  this.isCoverTop = checked;
-                  PreferencesUtil.put(SettingPage.IS_COVER_TOP, this.isCoverTop)
-                  this.sendChangeEvent()
-                })
-                .width(50)
-                .height(30);
-            }
-            .height(55)
-            .clickEffect({ level: ClickEffectLevel.HEAVY })
 
-              Line().width('100%').height(0.3).backgroundColor($r('app.color.index_tab_unselected_font_color'))
-                .opacity(this.isCoverTop ? 1 : 0)
-                .visibility(this.isCoverTop ? Visibility.Visible : Visibility.None)
-                .animation({
-                  duration: 500,
-                  curve: 'ease-in-out' // 可选动画曲线
-                })
               // 封面顶部
               Row() {
                 SymbolGlyph($r('sys.symbol.shutter_photo'))
@@ -1296,8 +1259,6 @@ export struct SettingPage {
               }
               .height(55)
               .clickEffect({ level: ClickEffectLevel.HEAVY })
-              .opacity(this.isCoverTop ? 1 : 0)
-              .visibility(this.isCoverTop ? Visibility.Visible : Visibility.None)
               .animation({
                 duration: 500,
                 curve: 'ease-in-out' // 可选动画曲线

+ 1 - 1
entry/src/main/ets/pages/UserCenter.ets

@@ -172,7 +172,7 @@ export struct UserCenter {
       hasCome: true
     },
     {
-      icon: $r('app.media.music_red'),
+      icon: $r('app.media.music_group'),
       title: '提取伴奏',
       description: '长按音乐可提取伴奏',
       isVipOnly: true,

+ 3 - 3
entry/src/main/ets/pages/WebDavMainPage.ets

@@ -1208,7 +1208,7 @@ export struct WebDavMainPage {
               Row() {
                 Text(crumb.label)
                   .fontSize(15)
-                  .fontColor(this.themeColor)
+                  .fontColor($r('app.color.text_color'))
                   .maxLines(1)
                   .textOverflow({ overflow: TextOverflow.Ellipsis })
               }
@@ -1456,12 +1456,12 @@ export struct WebDavMainPage {
       Row({ space: 12 }) {
         // 序号
         // 歌曲封面
-        Image(song.pixelMapPath ? song.pixelMapPath : $r('app.media.music_red'))
+        Image(song.pixelMapPath ? song.pixelMapPath : $r('app.media.alt'))
           .width(52)
           .height(52)
           .borderRadius(9)
           .sourceSize({width:38, height:38})
-          .alt($r('app.media.music_red'))
+          .alt($r('app.media.alt'))
           .fillColor(this.themeColor)
           .objectFit(ImageFit.Cover)
           .shadow({

+ 129 - 153
entry/src/main/ets/view/LocalMusic.ets

@@ -1499,7 +1499,6 @@ export struct LocalMusic {
     this.isShowTitleBar = PreferencesUtil.getBooleanSync(SettingPage.IS_SHOW_TITLTBAR, true)
     this.isShowAllBar = PreferencesUtil.getBooleanSync(SettingPage.IS_SHOW_ALLBAR, true)
     this.twoFingerType = PreferencesUtil.getNumberSync(SettingPage.TWO_FINGER_TYPE, 2)
-    this.isCoverTop = PreferencesUtil.getBooleanSync(SettingPage.IS_COVER_TOP, true)
     this.isCircleBtn = PreferencesUtil.getBooleanSync(SettingPage.IS_CIRCLE_BTN, true)
     this.isShowPlayPageBack = PreferencesUtil.getBooleanSync(SettingPage.IS_SHOW_PLAYPAGE_BACK, true)
     this.isCoverTopBig = PreferencesUtil.getBooleanSync(SettingPage.IS_COVER_TOP_BIG, false)
@@ -3371,7 +3370,8 @@ export struct LocalMusic {
           })
       }
       .bindContentCover($$this.isShowPlay, this.MusicPlayBuilder(), {
-        modalTransition: ModalTransition.DEFAULT,
+        modalTransition: this.isCoverRectangle?ModalTransition.DEFAULT:ModalTransition.NONE,
+        transition: this.isCoverRectangle?null:AnimationHelper.transitionInDown(500),
         onWillDisappear: () => {
           this.setShowPlayFalse()
         },
@@ -5057,11 +5057,11 @@ export struct LocalMusic {
       Row() {
         Stack() {
 
-          Image(StrUtil.isEmpty(item.pixelMapPath) ? $r('app.media.music_red') : item.pixelMapPath)
+          Image(StrUtil.isEmpty(item.pixelMapPath) ? $r('app.media.alt') : item.pixelMapPath)
             .fillColor(this.themeColor)
             .height(this.twoFingerType == 3 ? 55 : this.twoFingerType == 2 ? 50 : 40)
             .width(this.twoFingerType == 3 ? 55 : this.twoFingerType == 2 ? 50 : 40)
-            .alt($r('app.media.music_red'))
+            .alt($r('app.media.alt'))
             .borderRadius(this.isCoverRectangle?9:'100%')
             .clip(true)
             .draggable(false)
@@ -8230,7 +8230,7 @@ export struct LocalMusic {
         Row() {
           Stack() {
 
-            Image(StrUtil.isEmpty(currentItem.pixelMapPath) ? $r('app.media.music_red') :
+            Image(StrUtil.isEmpty(currentItem.pixelMapPath) ? $r('app.media.alt') :
               currentItem.pixelMapPath)
               .fillColor(this.themeColor)
               .height(80)
@@ -9127,10 +9127,10 @@ export struct LocalMusic {
       Row() {
         Stack() {
 
-          Image(StrUtil.isEmpty(item.pixelMapPath) ? $r('app.media.music_red') : item.pixelMapPath)
+          Image(StrUtil.isEmpty(item.pixelMapPath) ? $r('app.media.alt') : item.pixelMapPath)
             .height(this.sonTwoFingerType == 3||this.sonTwoFingerType==4 ? 55 : this.sonTwoFingerType == 2 ? 48 : 40)
             .width(this.sonTwoFingerType == 3||this.sonTwoFingerType==4 ? 55 : this.sonTwoFingerType == 2 ? 48 : 40)
-            .alt($r('app.media.music_red'))
+            .alt($r('app.media.alt'))
             .fillColor(this.themeColor)
             .borderRadius(this.isCoverRectangle?11:'100%')
             .clip(true)
@@ -9526,8 +9526,6 @@ export struct LocalMusic {
           //播放标题
           Column() {
             this.PlayTitle()
-
-
           }
           .position({ x: 0, y: this.isCoverOpacity() ? 15 : 40 })
           .width('100%')
@@ -10871,151 +10869,24 @@ export struct LocalMusic {
 
   @State is_auto_hide_progress: boolean = false //手机横屏自动隐藏播放进退条,点击屏幕可以显示,倒计时4秒后又自动隐藏
   @State isCoverRectangle: boolean = false
-  @State isCoverTop: boolean = true
   // 添加控制缩放的状态变量
   @State scaleValueImage: number = 1
   @State scaleValueText: number = 1
   @Builder
   CoverInfo() {
     Column() {
-
-      //如果是方形,判断是不是封面在顶部,如果不是顶部,显示musicNameInfo,  如果是圆形显示musicNameInfo
-      if (this.isCoverRectangle) {
-        if (!this.isCoverTop) {
-          this.musicNameInfo(false)
-        }
-      } else {
-        this.musicNameInfo(false)
-      }
-
-
       Stack() {
-        // 唱片旋转效果
-        Image($r('app.media.ic_music_disc'))
-          .width(245)
-          .height(245)
-          .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)
-          .borderRadius('100%')
-          .align(Alignment.Center)
-          .clip(true)// .rotate({ x: 0, y: 0, z: 1, angle: this.rotateAngle })
-          .rotate({
-            angle: this.rotateAngle,
-            centerX: "50%",
-            centerY: "50%",
-          })
-          .animation({
-            duration: 100,
-            curve: Curve.Linear
-          })
-          .shadow({
-            radius: 22,
-            type: ShadowType.BLUR,
-            color: 'on_primary'
-          })
-
         Column() {
-          if (this.isCoverTop  && this.isCoverRectangle) {
-            Image(this.cover)
-              .height(this.isHiCar()?(px2vp(this.windowHeight)*0.43):
-                this.isCoverOpacity()?(px2vp(this.windowHeight)*0.54):'auto')
-              .width(this.isHiCar()||this.isCoverOpacity()?'auto':this.isBigScreen() ? '72%' : this.isCoverTopBig ? '100%' : '88%')
-              .objectFit(this.isCoverRectangle ? ImageFit.Contain : ImageFit.Auto)
-              .alt($r('app.media.alt'))
-              .margin({ right: 8, left: 8, top: 8 })
-              .aspectRatio(1)
-              .geometryTransition('cover') // 绑定标识符
-              .opacity(this.opacityValueImage)
-              .scale({ x: this.scaleValueImage, y: this.scaleValueImage,
-                // 设置左下角为缩放中心点
-                centerX: '0%',
-                centerY: '100%' })
-              .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.8 })
-              .visibility(this.isPuraWP() ? Visibility.None : Visibility.Visible)
-              .borderRadius(this.isCoverRectangle ? 20 : '100%')
-              .clip(true)
-              .rotate({
-                x: 0,
-                y: 0,
-                z: 1,
-                angle: this.rotateAngle
-              })
-              .shadow({
-                radius: 22,
-                type: ShadowType.BLUR,
-                color: 'on_primary'
-              })
-              .onClick(() => {
-                this.isMusicBGCover = !this.isMusicBGCover
-              })
-            // .visualEffect(new hdsEffect.HdsEffectBuilder()
-            //   .shaderEffect({
-            //     effectType: hdsEffect.EffectType.DUAL_EDGE_FLOW_LIGHT,
-            //     animation: {
-            //       duration: 4000,
-            //       iterations: -1,
-            //       autoPlay: true,
-            //       onFinish: () => {
-            //         console.info('Succeeded in finishing');
-            //       }
-            //     },
-            //     controller: this.controller,
-            //     params: {
-            //       firstEdgeFlowLight: {
-            //         startPos: 0,
-            //         endPos: 1.0,
-            //         color: '#1AD0F1',
-            //       },
-            //       secondEdgeFlowLight: {
-            //         startPos: 0.5,
-            //         endPos: 1.5,
-            //         color: '#FFA4E5',
-            //       }
-            //     }
-            //   })
-            //   .buildEffect())
-
-
-
-            this.musicNameInfo(false)
+          //方形封面布局
+          if (this.isCoverRectangle) {
+            this.RectangleCoverView()
           } else {
-            Image(this.cover)
-              .height(this.isHiCarSmall()?(this.isHiCarKuanBianPing()?140:px2vp(this.windowHeight)*0.38):
-                (this.isCoverOpacity() ? (px2vp(this.windowHeight)*0.62) : this.isCoverRectangle ? 320 : 162))
-              .objectFit(this.isCoverRectangle ? ImageFit.Contain : ImageFit.Auto)
-              .alt($r('app.media.alt'))
-              .geometryTransition('cover') // 绑定标识符
-              .margin({ right: 20, left: 20,top:this.isCoverRectangle||this.isLandscape?0:43 })
-              .aspectRatio(1)
-              .opacity(this.opacityValueImage)
-              .scale({ x: this.scaleValueImage, y: this.scaleValueImage,
-                // 设置左下角为缩放中心点
-                centerX: '0%',
-                centerY: '100%' })
-              .visibility(this.isPuraWP() ? Visibility.None : Visibility.Visible)
-              .borderRadius(this.isCoverRectangle ? 20 : '100%')
-              .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.8 })
-              .align(Alignment.Center)//
-              .clip(true)
-              .shadow({
-                radius: 22,
-                type: ShadowType.BLUR,
-                color: 'on_primary'
-              })
-              .rotate({
-                x: 0,
-                y: 0,
-                z: 1,
-                angle: this.rotateAngle
-              })
-              .onClick(() => {
-                this.isMusicBGCover = !this.isMusicBGCover
-              })
-
+            //圆形封面布局
+            this.CicleCoverView()
           }
 
+          this.musicNameInfo(false)
+
           if (this.isPhoneLan()) {
             Text(this.name)
               .fontSize(18)
@@ -11032,14 +10903,6 @@ export struct LocalMusic {
 
         }
         .width('100%')
-        // 唱针以左上角为点选择逆时针40度
-        Image($r('app.media.ic_music_cover_hand'))
-          .height(130)
-          .margin({ bottom: 220, top: 0 })
-          .align(Alignment.Top)
-          .rotate({ angle: this.rotateAngle2, centerX: 0, centerY: 0 })
-          .opacity(this.isCoverOpacity() || this.isCoverRectangle ? 0 : 1)
-          .visibility(this.isHiCar()||this.isCoverOpacity() || this.isCoverRectangle ? Visibility.None : Visibility.Visible)
 
 
         Column({ space: 8 }) {
@@ -11089,6 +10952,119 @@ export struct LocalMusic {
     .clip(true)
 
   }
+  //方形封面布局
+  @Builder
+  RectangleCoverView(){
+
+    Stack({alignContent:Alignment.Center}){
+      Image(this.cover)
+        .height(this.isHiCar()?(px2vp(this.windowHeight)*0.43):
+          this.isCoverOpacity()?(px2vp(this.windowHeight)*0.54):'auto')
+        .width(this.isHiCar()||this.isCoverOpacity()?'auto':this.isBigScreen() ? '72%' : this.isCoverTopBig ? '100%' : '88%')
+        .objectFit(this.isCoverRectangle ? ImageFit.Contain : ImageFit.Auto)
+        .alt($r('app.media.alt'))
+        .margin({ right: 8, left: 8, top: 8 })
+        .aspectRatio(1)
+        .geometryTransition('cover') // 绑定标识符
+        .opacity(this.opacityValueImage)
+        .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.8 })
+        .visibility(this.isPuraWP() ? Visibility.None : Visibility.Visible)
+        .borderRadius(this.isCoverRectangle ? 20 : '100%')
+        .clip(true)
+        .rotate({
+          x: 0,
+          y: 0,
+          z: 1,
+          angle: this.rotateAngle
+        })
+        .shadow({
+          radius: 22,
+          type: ShadowType.BLUR,
+          color: 'on_primary'
+        })
+        .onClick(() => {
+          this.isMusicBGCover = !this.isMusicBGCover
+        })
+    }
+    .scale({ x: this.scaleValueImage, y: this.scaleValueImage,
+      // 设置左下角为缩放中心点
+      centerX: '0%',
+      centerY: '100%' })
+  }
+  @Builder
+  CicleCoverView() {
+    //圆形封面布局
+    Stack({alignContent:Alignment.Center}) {
+      Image($r('app.media.ic_music_disc'))
+        .width(245)
+        .height(245)
+        .margin({ right: 20, left: 20 ,top:this.isCoverRectangle||this.isLandscape?0:50 })
+        .aspectRatio(1)
+        .opacity(this.isCoverOpacity() || this.isCoverRectangle ? 0 : 1)
+        .visibility(this.isCoverOpacity() || this.isCoverRectangle ? Visibility.None : Visibility.Visible)
+        .borderRadius('100%')
+        .align(Alignment.Center)
+        .clip(true)// .rotate({ x: 0, y: 0, z: 1, angle: this.rotateAngle })
+        .rotate({
+          angle: this.rotateAngle,
+          centerX: "50%",
+          centerY: "50%",
+        })
+        .animation({
+          duration: 100,
+          curve: Curve.Linear
+        })
+        .shadow({
+          radius: 22,
+          type: ShadowType.BLUR,
+          color: 'on_primary'
+        })
+      Image(this.cover)
+        .height(this.isHiCarSmall()?(this.isHiCarKuanBianPing()?140:px2vp(this.windowHeight)*0.38):
+          (this.isCoverOpacity() ? (px2vp(this.windowHeight)*0.62) : this.isCoverRectangle ? 320 : 168))
+        .objectFit(this.isCoverRectangle ? ImageFit.Contain : ImageFit.Auto)
+        .alt($r('app.media.alt'))
+        // .geometryTransition('cover') // 绑定标识符
+        .margin({ right: 20, left: 20,
+          top:this.isCoverRectangle||this.isLandscape?0:50})
+        .aspectRatio(1)
+        .opacity(this.opacityValueImage)
+        .visibility(this.isPuraWP() ? Visibility.None : Visibility.Visible)
+        .borderRadius(this.isCoverRectangle ? 20 : '100%')
+        .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.8 })
+        .align(Alignment.Center)//
+        .clip(true)
+        .shadow({
+          radius: 22,
+          type: ShadowType.BLUR,
+          color: 'on_primary'
+        })
+        .rotate({
+          x: 0,
+          y: 0,
+          z: 1,
+          angle: this.rotateAngle
+        })
+        .onClick(() => {
+          this.isMusicBGCover = !this.isMusicBGCover
+        })
+
+      // 唱针以左上角为点选择逆时针40度
+      Image($r('app.media.ic_music_cover_hand'))
+        .height(130)
+        .margin({ bottom: 200, top: 0 })
+        // .position({ x: this.windowWidth/2, y: 0 })
+        .align(Alignment.Top)
+        .rotate({ angle: this.rotateAngle2, centerX: 0, centerY: 0 })
+        .opacity(this.isCoverOpacity() || this.isCoverRectangle ? 0 : 1)
+        .visibility(this.isHiCar()||this.isCoverOpacity() || this.isCoverRectangle ? Visibility.None : Visibility.Visible)
+
+    }
+    .scale({ x: this.scaleValueImage, y: this.scaleValueImage,
+      // 设置左下角为缩放中心点
+      centerX: '0%',
+      centerY: '100%' })
+  }
 
   @Builder
   private musicNameInfo(isHidden: boolean) {
@@ -11146,7 +11122,7 @@ export struct LocalMusic {
     }
     .width(this.isLandscape?'83%':'90%')
     .scale({ x: this.scaleValueText, y: this.scaleValueText }) // 添加缩放效果
-    .margin({ top:this.isCoverTop?10: 15 })
+    .margin({ top:this.isCoverRectangle?10: 0 })
     .visibility(this.isCoverOpacity() || isHidden ? Visibility.None : Visibility.Visible)
   }
 
@@ -12579,7 +12555,7 @@ export struct LocalMusic {
 
     { id: 13, image: $r('app.media.rectangle'), title: '封面方形' },
 
-    { id : 21, image: $r('app.media.music_red'), title: '开启背景流光' },
+    { id : 21, image: $r('app.media.kp_music'), title: '开启背景流光' },
 
     { id: 8, image: $r('app.media.cut_current'), title: '保存播放模式' },
 

+ 5 - 5
entry/src/main/ets/view/NavidromePage.ets

@@ -1076,7 +1076,7 @@ export struct NavidromePage {
     Button({ type: ButtonType.Capsule, stateEffect: true }) {
       Row({ space: 12 }) {
         // 歌曲封面
-        Image(song.pixelMapPath ? song.pixelMapPath : $r('app.media.music_red'))
+        Image(song.pixelMapPath ? song.pixelMapPath : $r('app.media.alt'))
           .width(52)
           .height(52)
           .borderRadius(9)
@@ -1084,7 +1084,7 @@ export struct NavidromePage {
           .draggable(false)
           .interpolation(ImageInterpolation.High)// 用于重采样后的抗锯齿
           .autoResize(true) // 重采样,可减少内存占用
-          .alt($r('app.media.music_red'))
+          .alt($r('app.media.alt'))
           .fillColor(song.pixelMapPath ? undefined : this.themeColor)
           .objectFit(ImageFit.Cover)
           .margin({ left: 20 })
@@ -1154,7 +1154,7 @@ export struct NavidromePage {
   buildArtistItem(artist: NavidromeRestArtist) {
     Button({ type: ButtonType.Capsule, stateEffect: true }) {
       Row({ space: 12 }) {
-        Image(artist.coverUrl ?? $r('app.media.music_red'))
+        Image(artist.coverUrl ?? $r('app.media.alt'))
           .width(48)
           .height(48)
           .borderRadius(10)
@@ -1200,7 +1200,7 @@ export struct NavidromePage {
   buildAlbumItem(album: NavidromeRestAlbum) {
     Button({ type: ButtonType.Capsule, stateEffect: true }) {
       Row({ space: 12 }) {
-        Image(album.coverUrl ?? $r('app.media.music_red'))
+        Image(album.coverUrl ?? $r('app.media.alt'))
           .width(48)
           .height(48)
           .borderRadius(10)
@@ -1571,7 +1571,7 @@ export struct NavidromePage {
       // 空状态
       if (this.getCurrentCount() === 0 && !(this.selectedTab === 0 && this.filterType !== NavFilterType.None && this.isFilterLoading) && !(this.isSearchMode && this.searchText.length > 0 && this.isSearchLoading)) {
         Column() {
-          Image($r('app.media.music_red'))
+          Image($r('app.media.alt'))
             .width(80)
             .height(80)
             .opacity(0.6)

+ 0 - 1
entry/src/main/resources/base/media/music_red.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1749976802589" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1517" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M150.588235 542.117647a30.117647 30.117647 0 1 1 60.235294 0 271.058824 271.058824 0 0 0 271.058824 271.058824 30.117647 30.117647 0 1 1 0 60.235294C298.917647 873.411765 150.588235 725.082353 150.588235 542.117647z m722.82353-60.235294a30.117647 30.117647 0 1 1-60.235294 0 271.058824 271.058824 0 0 0-271.058824-271.058824 30.117647 30.117647 0 1 1 0-60.235294c182.964706 0 331.294118 148.329412 331.294118 331.294118zM512 1024C229.225412 1024 0 794.774588 0 512S229.225412 0 512 0s512 229.225412 512 512-229.225412 512-512 512z m0-60.235294c249.494588 0 451.764706-202.270118 451.764706-451.764706 0-249.494588-202.270118-451.764706-451.764706-451.764706C262.505412 60.235294 60.235294 262.505412 60.235294 512c0 249.494588 202.270118 451.764706 451.764706 451.764706z m0-331.294118a120.470588 120.470588 0 1 1 0-240.941176 120.470588 120.470588 0 0 1 0 240.941176z m0-60.235294a60.235294 60.235294 0 1 0 0-120.470588 60.235294 60.235294 0 0 0 0 120.470588z" fill="#dd2d1e" p-id="1518"></path></svg>