onecold 1 ano atrás
pai
commit
46561f437e

+ 23 - 20
entry/src/main/ets/pages/SettingPage.ets

@@ -239,6 +239,7 @@ export struct SettingPage {
       Row({ space: 20 }) {
       Row({ space: 20 }) {
         IBestButton({
         IBestButton({
           text: "取消",
           text: "取消",
+          btnBorderRadius:10,
           onBtnClick: () => {
           onBtnClick: () => {
             this.showColorPicker = false
             this.showColorPicker = false
           }
           }
@@ -246,6 +247,7 @@ export struct SettingPage {
         IBestButton({
         IBestButton({
           type: "primary",
           type: "primary",
           text: "确定",
           text: "确定",
+          btnBorderRadius:10,
           onBtnClick: () => {
           onBtnClick: () => {
             this.themeColor = this.customColor
             this.themeColor = this.customColor
             PreferencesUtil.putSync(SettingPage.THEME_COLOR_KEY, this.customColor)
             PreferencesUtil.putSync(SettingPage.THEME_COLOR_KEY, this.customColor)
@@ -265,17 +267,17 @@ export struct SettingPage {
       Column() {
       Column() {
         Row() {
         Row() {
           Row(){
           Row(){
-            IBestIcon({ name: 'brush-o', color: this.themeColor })
+            IBestIcon({ name: 'brush-o', color: this.themeColor , iconSize: 20 })
               .margin({ right: 8 })
               .margin({ right: 8 })
             Text('颜色模式')
             Text('颜色模式')
               .fontSize(15)
               .fontSize(15)
               .fontWeight(500)
               .fontWeight(500)
           }
           }
-          .margin({ top: 12 })
-
+          .layoutWeight(1)
+          Blank()
           Row(){
           Row(){
             IBestRadioGroup({ group: this.colorGroup, active: $themeMode, placeDirection: Axis.Horizontal }) {
             IBestRadioGroup({ group: this.colorGroup, active: $themeMode, placeDirection: Axis.Horizontal }) {
-              ForEach(['自动', '明亮', '黑暗'], (item: string, idx: number) => {
+              ForEach(['自动', '日间', '夜间'], (item: string, idx: number) => {
                 Column() {
                 Column() {
                   IBestRadio({
                   IBestRadio({
                     group: this.colorGroup,
                     group: this.colorGroup,
@@ -283,6 +285,7 @@ export struct SettingPage {
                     label: '',
                     label: '',
                     name: idx
                     name: idx
                   })
                   })
+                    .margin({ left: 3 })
                   Text(item)
                   Text(item)
                     .fontSize(15)
                     .fontSize(15)
                     .fontColor($r('app.color.text_color'))
                     .fontColor($r('app.color.text_color'))
@@ -297,9 +300,8 @@ export struct SettingPage {
               })
               })
             }
             }
           }
           }
-          .margin({left:24,right:12})
+          .margin({left:12,right:12})
         }
         }
-        .margin({ top: 12 })
       }
       }
       .backgroundColor($r('app.color.settings_background_main'))
       .backgroundColor($r('app.color.settings_background_main'))
       .borderRadius(18)
       .borderRadius(18)
@@ -313,10 +315,9 @@ export struct SettingPage {
       .margin({
       .margin({
         left: 0,
         left: 0,
         right: 0,
         right: 0,
-        top: 10,
-        bottom: 18
+        bottom: 20
       })
       })
-      .padding({ top: 18, bottom: 18, left: 0, right: 0 })
+      .padding({ top: 18, bottom: 18, left: 20, right: 20 })
       .width('90%')
       .width('90%')
 
 
       // 主题色分组卡片
       // 主题色分组卡片
@@ -327,14 +328,15 @@ export struct SettingPage {
               .width(20)
               .width(20)
               .height(20)
               .height(20)
               .fillColor(this.themeColor)
               .fillColor(this.themeColor)
-            // .margin({ right: 8 })
             Text('主题色')
             Text('主题色')
               .fontSize(15)
               .fontSize(15)
               .fontWeight(500)
               .fontWeight(500)
+              .margin({ left: 8 })
+              .layoutWeight(1)
 
 
         }
         }
-        .margin({left:36, top: 12 })
-        .width("90%")
+        .margin({left:20, top: 12 })
+
 
 
         Row(){
         Row(){
           Column() {
           Column() {
@@ -356,9 +358,10 @@ export struct SettingPage {
                     }
                     }
                     .alignItems(VerticalAlign.Center)
                     .alignItems(VerticalAlign.Center)
                     .justifyContent(FlexAlign.Start)
                     .justifyContent(FlexAlign.Start)
+                    .layoutWeight(1)
                   }
                   }
-                  .width('42%')
                   .height(40)
                   .height(40)
+                  .layoutWeight(1)
                   .backgroundColor(
                   .backgroundColor(
                     (item.name === '自定义' && this.isCustomThemeColor()) || this.themeColor === item.color
                     (item.name === '自定义' && this.isCustomThemeColor()) || this.themeColor === item.color
                       ? this.themeColor
                       ? this.themeColor
@@ -375,11 +378,11 @@ export struct SettingPage {
                       this.sendChangeEvent()
                       this.sendChangeEvent()
                     }
                     }
                   })
                   })
-                  .margin({ right: colIdx === 0 ? '4%' : 0, bottom: 10, left: 0 })
+
+                  .margin({ right: colIdx === 0 ? '4%' : 20, bottom: 10, left: 20 })
                 })
                 })
               }
               }
               .justifyContent(FlexAlign.Start)
               .justifyContent(FlexAlign.Start)
-              .margin({ left: 12, right: 12 })
             })
             })
           }
           }
           .margin({ left: 12, right: 12, top: 12 })
           .margin({ left: 12, right: 12, top: 12 })
@@ -399,7 +402,6 @@ export struct SettingPage {
       .margin({
       .margin({
         left: 0,
         left: 0,
         right: 0,
         right: 0,
-        top: 10,
         bottom: 18
         bottom: 18
       })
       })
       .padding({ top: 18, bottom: 18, left: 0, right: 0 })
       .padding({ top: 18, bottom: 18, left: 0, right: 0 })
@@ -408,7 +410,8 @@ export struct SettingPage {
       IBestPopup({
       IBestPopup({
         visible: $showColorPicker,
         visible: $showColorPicker,
         popupWidth: 320,
         popupWidth: 320,
-        contentBuilder: (): void => this.pickerBuilder()
+        contentBuilder: (): void => this.pickerBuilder(),
+        cornerRadius:20,
       })
       })
     }
     }
     .padding({ top: 8, bottom: 8, left: 18, right: 18 })
     .padding({ top: 8, bottom: 8, left: 18, right: 18 })
@@ -491,7 +494,7 @@ export struct SettingPage {
               // }
               // }
             })
             })
             .bindSheet($$this.isThemeSheet, this.themeSheetBuilder(), {
             .bindSheet($$this.isThemeSheet, this.themeSheetBuilder(), {
-              height: '90%',
+              height: '95%',
               dragBar: true,
               dragBar: true,
               preferType: this.currentBreakpoint !== BreakpointTypeEnum.SM ? SheetType.CENTER : SheetType.BOTTOM,
               preferType: this.currentBreakpoint !== BreakpointTypeEnum.SM ? SheetType.CENTER : SheetType.BOTTOM,
               showClose: true,
               showClose: true,
@@ -513,7 +516,7 @@ export struct SettingPage {
                 .fontWeight(480)
                 .fontWeight(480)
                 .layoutWeight(1)
                 .layoutWeight(1)
                 .bindSheet($$this.isCustomizeBgSheet, this.customizeBgSheet(), {
                 .bindSheet($$this.isCustomizeBgSheet, this.customizeBgSheet(), {
-                  height: '90%',
+                  height: '95%',
                   dragBar: true,
                   dragBar: true,
                   preferType: this.currentBreakpoint !== BreakpointTypeEnum.SM ? SheetType.CENTER : SheetType.BOTTOM,
                   preferType: this.currentBreakpoint !== BreakpointTypeEnum.SM ? SheetType.CENTER : SheetType.BOTTOM,
                   showClose: true,
                   showClose: true,
@@ -905,7 +908,7 @@ export struct SettingPage {
   //发送广播通知更新UI
   //发送广播通知更新UI
   sendChangeEvent() {
   sendChangeEvent() {
     const eventData: emitter.EventData = {};
     const eventData: emitter.EventData = {};
-    emitter.emit({ eventId: 333 }, eventData); // 发送音频广播通知更新doSwipBack
+    emitter.emit({ eventId: 333 }, eventData); // 发送广播通知更新doSwipBack
   }
   }
 
 
   goSelectImage() {
   goSelectImage() {

+ 13 - 12
entry/src/main/ets/view/LocalMusic.ets

@@ -2499,6 +2499,7 @@ export struct LocalMusic {
           })
           })
         Image($r("app.media.top_rank"))
         Image($r("app.media.top_rank"))
           .width(25)// .opacity(this.opacityItem)
           .width(25)// .opacity(this.opacityItem)
+          .fillColor(this.themeColor)
           .animation({
           .animation({
             duration: 666,
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
             curve: 'ease-in-out' // 可选动画曲线
@@ -2508,14 +2509,13 @@ export struct LocalMusic {
             this.showRankDialog()
             this.showRankDialog()
           })
           })
 
 
-        SymbolGlyph(this.isGridMusic?$r('sys.symbol.list_bullet'):$r('sys.symbol.square_grid_2x2'))
-        .fontColor([this.themeColor])
+        Image(this.isGridMusic?$r('app.media.list'):$r("app.media.grid"))
           .width(25)
           .width(25)
           .animation({
           .animation({
             duration: 666,
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
             curve: 'ease-in-out' // 可选动画曲线
           })
           })
-
+          .fillColor(this.themeColor)
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .onClick(() => {
           .onClick(() => {
             this.isGridMusic = !this.isGridMusic
             this.isGridMusic = !this.isGridMusic
@@ -2608,28 +2608,29 @@ export struct LocalMusic {
         })
         })
 
 
         Blank()
         Blank()
-        Image($r("app.media.search"))
-          .width(25)// .visibility(this.modeType===1?Visibility.Visible:Visibility.None)
+        Image(this.isGridMusic?$r('app.media.list'):$r("app.media.grid"))
+          .width(25)
           .animation({
           .animation({
             duration: 666,
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
             curve: 'ease-in-out' // 可选动画曲线
-          })// .opacity(this.opacityItem)
+          })
           .fillColor(this.themeColor)
           .fillColor(this.themeColor)
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .onClick(() => {
           .onClick(() => {
-            this.isSearchMode = true
+            this.isGridMusic = !this.isGridMusic
           })
           })
-        Image(this.isGridMusic?$r('app.media.list'):$r("app.media.grid"))
-          .width(25)
+        Image($r("app.media.search"))
+          .width(25)// .visibility(this.modeType===1?Visibility.Visible:Visibility.None)
           .animation({
           .animation({
             duration: 666,
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
             curve: 'ease-in-out' // 可选动画曲线
-          })
+          })// .opacity(this.opacityItem)
           .fillColor(this.themeColor)
           .fillColor(this.themeColor)
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .onClick(() => {
           .onClick(() => {
-            this.isGridMusic = !this.isGridMusic
+            this.isSearchMode = true
           })
           })
+
         // Image($r("app.media.refresh"))
         // Image($r("app.media.refresh"))
         IBestIcon({ name: 'replay',iconSize:25,color:this.themeColor })
         IBestIcon({ name: 'replay',iconSize:25,color:this.themeColor })
           // .width(25)
           // .width(25)
@@ -3645,7 +3646,7 @@ export struct LocalMusic {
 
 
             })
             })
               .color(this.themeColor)// 进度条前景色为灰色
               .color(this.themeColor)// 进度条前景色为灰色
-              .backgroundColor(Color.Pink)
+              .backgroundColor($r('app.color.index_background'))
               .height(36)
               .height(36)
               .aspectRatio(CommonConstants.ASPECT_RATIO)
               .aspectRatio(CommonConstants.ASPECT_RATIO)
             Image(this.CONTROL_PlayStatus === PlayStatus.PLAY ? $r('app.media.hm_pause') : $r('app.media.hm_play2'))
             Image(this.CONTROL_PlayStatus === PlayStatus.PLAY ? $r('app.media.hm_pause') : $r('app.media.hm_play2'))

BIN
entry/src/main/resources/base/media/hm_next.png


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

@@ -0,0 +1 @@
+<?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="1750042830304" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5390" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M832 160.128c0-17.664-14.336-32-32-32S768 142.464 768 160.128l0 282.88L214.592 134.592c-18.176-10.112-39.936-10.048-58.112 0C138.24 144.768 127.424 162.88 127.424 183.168l0 656.64c0 20.224 10.816 38.464 29.056 48.576C165.568 893.44 175.488 896 185.472 896s19.968-2.56 29.056-7.616L768 579.968l0 284.096c0 17.664 14.336 32 32 32s32-14.336 32-32L832 160.128zM191.808 829.248 188.672 192l573.312 319.488L191.808 829.248z" p-id="5391"></path></svg>

BIN
entry/src/main/resources/base/media/hm_pause.png


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

@@ -0,0 +1 @@
+<?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="1750044005313" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1845" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M512 0C229.227168 0 0 229.227168 0 512s229.227168 512 512 512S1024 794.772832 1024 512 794.772832 0 512 0z m-60.831546 704.742145c0 34.190805-25.027836 62.180268-55.617413 62.180268s-55.617413-27.975559-55.617413-62.180268V319.257855c0-34.190805 25.027836-62.180268 55.617413-62.180268s55.617413 27.975559 55.617413 62.180268z m225.945741 0c0 34.190805-25.027836 62.180268-55.617413 62.180268s-55.617413-27.975559-55.617413-62.180268V319.257855c0-34.190805 25.027836-62.180268 55.617413-62.180268s55.617413 27.975559 55.617413 62.180268z" p-id="1846"></path></svg>

BIN
entry/src/main/resources/base/media/hm_play2.png


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

@@ -0,0 +1 @@
+<?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="1750044112792" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2169" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M512 0C229.227168 0 0 229.227168 0 512s229.227168 512 512 512S1024 794.772832 1024 512 794.772832 0 512 0z m183.134237 556.605165l-234.455205 209.955734c-37.541754 23.428835-84.621894-5.853733-84.621894-52.725307v-419.911468c0-46.85767 47.010618-76.154143 84.621894-52.725308l234.455205 209.955734c37.611276 23.44274 37.611276 82.02178 0 105.450615z" p-id="2170"></path></svg>

BIN
entry/src/main/resources/base/media/hm_previous.png


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

@@ -0,0 +1 @@
+<?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="1750042752953" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8058" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M803.584 134.592c-18.176-10.048-39.936-10.112-58.112 0L192 443.008l0-282.88c0-17.664-14.336-32-32-32S128 142.464 128 160.128l0 344.896C127.744 507.2 127.104 509.248 127.104 511.488S127.744 515.84 128 518.016l0 346.112c0 17.664 14.336 32 32 32s32-14.336 32-32L192 579.968l553.408 308.352C754.56 893.44 764.48 896 774.528 896s19.968-2.56 29.056-7.616c18.176-10.112 28.992-28.224 28.992-48.576L832.576 183.104C832.576 162.88 821.76 144.768 803.584 134.592zM768.192 829.248 198.016 511.488 771.328 192 768.192 829.248z" p-id="8059"></path></svg>