onecold пре 1 година
родитељ
комит
f7cac04f65
2 измењених фајлова са 37 додато и 51 уклоњено
  1. 2 2
      AppScope/app.json5
  2. 35 49
      entry/src/main/ets/view/LocalMusic.ets

+ 2 - 2
AppScope/app.json5

@@ -2,8 +2,8 @@
   "app": {
     "bundleName": "com.xgplayer.ttmusic.hm",
     "vendor": "example",
-    "versionCode": 20250706,
-    "versionName": "1.4.5",
+    "versionCode": 20250717,
+    "versionName": "1.4.6",
     "icon": "$media:app_icon",
     "label": "$string:app_name",
     "multiAppMode": {

+ 35 - 49
entry/src/main/ets/view/LocalMusic.ets

@@ -2004,23 +2004,10 @@ export struct LocalMusic {
 
               if(!this.isShowCoverHeader()){
                 this.tabTitle()
-                this.listViewTitle()
               }
 
               if(this.isGridMusic){
-                // if(this.isShowCoverHeader()){
-                //   Scroll(){
-                //     Column(){
-                //       this.coverHeader()
-                //       this.getGridView()
-                //     }
-                //
-                //   }
-                //
-                // }else{
-                  this.getGridView()
-                // }
-
+                this.getGridView()
               }else {
                 this.getListView()
               }
@@ -2813,8 +2800,9 @@ export struct LocalMusic {
       .justifyContent(FlexAlign.SpaceBetween)
       .transition(TransitionEffect.asymmetric(TransitionEffect.scale({ x: 0.7, y: 0.7}).animation({ duration: 500 }),
         TransitionEffect.scale({ x: 0, y: 0 })  ))
-      .clickEffect({level:ClickEffectLevel.LIGHT})
 
+    }else{
+      this.listViewTitle()
     }
 
   }
@@ -2896,7 +2884,7 @@ export struct LocalMusic {
             curve: 'ease-in-out' // 可选动画曲线
           })// .opacity(this.opacityItem)
           .fillColor(this.themeColor)
-          .clickEffect({ level: ClickEffectLevel.MIDDLE })
+          .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.6 })
           .onClick(() => {
             this.isSearchMode = true
           })
@@ -2907,7 +2895,7 @@ export struct LocalMusic {
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
           })
-          .clickEffect({ level: ClickEffectLevel.MIDDLE })
+          .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.6 })
           .onClick(() => {
             this.showRankDialog()
           })
@@ -2919,7 +2907,7 @@ export struct LocalMusic {
             curve: 'ease-in-out' // 可选动画曲线
           })
           .fillColor(this.themeColor)
-          .clickEffect({ level: ClickEffectLevel.MIDDLE })
+          .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.6 })
           .onClick(() => {
             this.isGridMusic = !this.isGridMusic
           })
@@ -2957,13 +2945,13 @@ export struct LocalMusic {
               curve: 'ease-in-out' // 可选动画曲线
             })
         }
-        .clickEffect({level:ClickEffectLevel.LIGHT})
+        .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.6 })
         .visibility(this.isSearchMode ? Visibility.None : Visibility.Visible)
         .animation({
           duration: 666,
           curve: 'ease-in-out' // 可选动画曲线
         })
-        .backgroundColor(this.isClickedPLayAll ? $r('app.color.button_click') : Color.Transparent)
+        // .backgroundColor(this.isClickedPLayAll ? $r('app.color.button_click') : Color.Transparent)
         .onTouch((event: TouchEvent) => {
           if (event.type === TouchType.Down) {
             this.isClickedPLayAll = true;
@@ -2997,6 +2985,7 @@ export struct LocalMusic {
             .margin({ left: 10, right: 10 })
             .fontColor($r('app.color.text_color'))
             .fontSize(16)
+            .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.6 })
             .onClick(() => {
               this.isSearchMode = false
               this.searchText = ''
@@ -3019,7 +3008,7 @@ export struct LocalMusic {
             curve: 'ease-in-out' // 可选动画曲线
           })// .opacity(this.opacityItem)
           .fillColor(this.themeColor)
-          .clickEffect({level:ClickEffectLevel.LIGHT})
+          .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.6 })
           .onClick(() => {
             this.isSearchMode = true
           })
@@ -3032,7 +3021,7 @@ export struct LocalMusic {
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
           })
-          .clickEffect({level:ClickEffectLevel.LIGHT})
+          .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.6 })
           .onClick(() => {
             if(this.isFavMusic){
               this.getFavList(true)
@@ -3051,7 +3040,7 @@ export struct LocalMusic {
             curve: 'ease-in-out' // 可选动画曲线
           })
           .fillColor(this.themeColor)
-          .clickEffect({level:ClickEffectLevel.HEAVY})
+          .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.6 })
           .onClick(() => {
             this.showRankDialog()
           })
@@ -3065,7 +3054,7 @@ export struct LocalMusic {
             curve: 'ease-in-out' // 可选动画曲线
           })
           .fillColor(this.themeColor)
-          .clickEffect({ level: ClickEffectLevel.MIDDLE })
+          .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.6 })
           .onClick(() => {
             this.isMultiSelect = !this.isMultiSelect
           })
@@ -3079,7 +3068,7 @@ export struct LocalMusic {
             curve: 'ease-in-out' // 可选动画曲线
           })
 
-          .clickEffect({ level: ClickEffectLevel.MIDDLE })
+          .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.6 })
           .onClick(() => {
             this.clearVideoHistory() //清空播放记录
           })
@@ -3091,7 +3080,7 @@ export struct LocalMusic {
             curve: 'ease-in-out' // 可选动画曲线
           })
           .fillColor(this.themeColor)
-          .clickEffect({ level: ClickEffectLevel.MIDDLE })
+          .clickEffect({ level: ClickEffectLevel.MIDDLE,scale:0.6 })
           .onClick(() => {
             this.isGridMusic = !this.isGridMusic
           })
@@ -3106,8 +3095,6 @@ export struct LocalMusic {
       })
 
     }
-    .height(this.topBarHeight)
-    .opacity(this.barOpacity)
     .visibility(this.isShowAllBar?Visibility.Visible:Visibility.None)
 
   }
@@ -3258,21 +3245,21 @@ export struct LocalMusic {
   @State pinchValue:number = 1
   layoutOptionsForHeader: GridLayoutOptions = {
     regularSize: [1, 1],        // 只支持[1, 1]
-    irregularIndexes: [0],   // 索引为0和6的GridItem占用一行
-  };
-  layoutOptions: GridLayoutOptions = {
-    regularSize: [1, 1],        // 只支持[1, 1]
+    irregularIndexes: [0],   // 索引为0的GridItem占用一行
   };
+
   @Builder
   getGridView(){
 
-    Grid(this.scroller,this.isShowCoverHeader()?this.layoutOptionsForHeader:this.layoutOptions) {
-      if(this.isShowCoverHeader()){
-        GridItem(){
+    Grid(this.scroller,this.layoutOptionsForHeader) {
+      GridItem(){
+        if(this.isShowCoverHeader()){
           this.coverHeader()
+        }else {
+          this.listViewTitle()
         }
-
       }
+
       LazyForEach(this.dataSource, (item: VideoItem, index: number) => {
 
         GridItem() {
@@ -4095,20 +4082,19 @@ export struct LocalMusic {
           this.currentPath = item.filePath
           this.currentTitleCover = $r('app.media.ic_avatar5')
           this.getSortedFiles(this.currentPath)
-          if (this.isGridMusic) {
-            this.scroller.scrollToIndex(0)
-          }
-          // this.listScroller.scrollToIndex(0)
-          //进入歌单的时候的滚动位置在顶部
-          setTimeout(() => {
-            if(this.modeType ==0){
-              if (!this.isGridMusic) {
-                this.listScroller.scrollToIndex(0)
-              }
-            }
-          }, 200)
-        }
 
+        }
+        //进入歌单的时候的滚动位置在顶部
+        if (this.isGridMusic) {
+          this.scroller.scrollToIndex(0)
+        }
+        setTimeout(() => {
+          if(this.modeType ==0){
+            if (!this.isGridMusic) {
+              this.listScroller.scrollToIndex(0)
+            }
+          }
+        }, 200)
         break;
       case CommonConstants.TYPE_IS_ARTIST:
         // 进入艺术家前安全保存当前滚动偏移量,支持列表和网格