Explorar el Código

修复AB循环报错
歌单颜色调整

onecold hace 9 meses
padre
commit
d3e4365fa4

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

@@ -260,9 +260,10 @@ struct AddSongsToPlaylistDialogContent {
         Button('取消')
           .width('45%')
           .height(40)
-          .backgroundColor($r('app.color.cancel_button_background'))
           .borderRadius(8)
           .fontSize(14)
+          .backgroundColor(this.isDarkMode ? themeColorWithAlpha(this.themeColor, 0.8, this.isDarkMode)
+            :$r('app.color.cancel_button_background') )
           .fontColor($r('app.color.cancel_button_text'))
           .onClick(() => {
             this.onCancel?.()
@@ -272,7 +273,7 @@ struct AddSongsToPlaylistDialogContent {
         Button(`添加${this.selectedSongs.length > 0 ? `(${this.selectedSongs.length})` : ''}`)
           .width('45%')
           .height(40)
-          .backgroundColor(this.isDarkMode ? themeColorWithAlpha(this.themeColor, 0.8, this.isDarkMode) : this.themeColor)
+          .backgroundColor(this.isDarkMode ? $r('app.color.silvery'):this.themeColor)
           .borderRadius(8)
           .fontSize(14)
           .fontColor(Color.White)

+ 3 - 2
entry/src/main/ets/dialog/AddToPlaylistDialog.ets

@@ -196,7 +196,8 @@ struct AddToPlaylistDialogContent {
         Button('取消')
           .width('45%')
           .height(40)
-          .backgroundColor($r('app.color.cancel_button_background'))
+          .backgroundColor(this.isDarkMode ? themeColorWithAlpha(this.themeColor, 0.8, this.isDarkMode)
+            :$r('app.color.cancel_button_background') )
           .borderRadius(8)
           .fontSize(14)
           .fontColor($r('app.color.cancel_button_text'))
@@ -208,7 +209,7 @@ struct AddToPlaylistDialogContent {
         Button('添加')
           .width('45%')
           .height(40)
-          .backgroundColor(this.isDarkMode ? '#000000' : this.themeColor)
+          .backgroundColor(this.isDarkMode ? $r('app.color.silvery'):this.themeColor)
           .borderRadius(8)
           .fontSize(14)
           .fontColor(Color.White)

+ 3 - 2
entry/src/main/ets/dialog/PlaylistDialog.ets

@@ -191,7 +191,8 @@ struct PlaylistDialogContent {
         Button('取消',{ type: ButtonType.Capsule, stateEffect: true })
           .width('45%')
           .height(40)
-          .backgroundColor($r('app.color.cancel_button_background'))
+          .backgroundColor(this.isDarkMode ? themeColorWithAlpha(this.themeColor, 0.8, this.isDarkMode)
+            :$r('app.color.cancel_button_background') )
           .borderRadius(8)
           .fontSize(14)
           .fontColor($r('app.color.cancel_button_text'))
@@ -204,7 +205,7 @@ struct PlaylistDialogContent {
         Button(this.isEditMode ? '保存' : '创建',{ type: ButtonType.Capsule, stateEffect: true })
           .width('45%')
           .height(40)
-          .backgroundColor(this.isDarkMode ? themeColorWithAlpha(this.themeColor, 0.8, this.isDarkMode) : this.themeColor)
+          .backgroundColor(this.isDarkMode ? $r('app.color.silvery'):this.themeColor)
           .borderRadius(8)
           .fontSize(14)
           .fontColor(Color.White)

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

@@ -745,22 +745,22 @@ export struct PlaylistDetailPage {
               Row({ space: 6 }) {
                 Text('🗑️')
                   .fontSize(16)
-
+                  .fontColor(this.isDarkMode ? Color.White : this.themeColor)
                 Text('删除')
                   .fontSize(14)
-                  .fontColor(Color.Red)
+                  .fontColor(this.isDarkMode ? Color.White : this.themeColor)
                   .fontWeight(FontWeight.Medium)
               }
               .justifyContent(FlexAlign.Center)
             }
             .layoutWeight(1)
             .height(44)
-            .backgroundColor(Color.Transparent)
-            .borderRadius(22)
             .border({
               width: 1.5,
-              color: Color.Red
+              color: this.isDarkMode ? themeColorWithAlpha(this.themeColor, 0.6, this.isDarkMode) : this.themeColor
             })
+            .backgroundColor(Color.Transparent)
+            .borderRadius(22)
             .onClick(() => {
               this.deletePlaylist()
             })

+ 2 - 4
entry/src/main/ets/view/LocalMusic.ets

@@ -361,9 +361,8 @@ export struct LocalMusic {
       } else {
         PreferencesUtil.putSync(this.currentSongListID+'currentSongList', JSON.stringify(this.currentSongList));
       }
-
-
     }
+    this.isRefreshing = false
   }
 
   onModeChange() {
@@ -10925,8 +10924,7 @@ export struct LocalMusic {
         this.isShowMoreView = false
         break;
       case 20://AB循环
-        this.isOpenAB = !this.isOpenAB;
-        this.isABSheet = false
+        this.isABSheet =  !this.isABSheet
         break;
     }