Explorar o código

提交1.5.5版本

onecold hai 11 meses
pai
achega
755bb374c5

+ 2 - 2
AppScope/app.json5

@@ -2,8 +2,8 @@
   "app": {
     "bundleName": "com.xgplayer.ttmusic.hm",
     "vendor": "example",
-    "versionCode": 20250829,
-    "versionName": "1.5.4",
+    "versionCode": 20250903,
+    "versionName": "1.5.5",
     "icon": "$media:app_icon",
     "label": "$string:app_name",
     "multiAppMode": {

+ 3 - 2
entry/src/main/ets/pages/ChartsCount.ets

@@ -178,11 +178,12 @@ export struct ChartsCount {
     Row() {
       Swiper() {
         McPieChart({
-          options: this.defOption
+          options: this.HrOption
         })
         McPieChart({
-          options: this.HrOption
+          options: this.defOption
         })
+
       }
 
     }

+ 7 - 2
entry/src/main/ets/pages/SettingPage.ets

@@ -1704,14 +1704,19 @@ export struct SettingPage {
     // API设置分组
     Column() {
       Row() {
-        Text('API设置')
+        Text(){
+          Span('API设置')
+          Span('\n(请注意:使用此功能您需拥有相关著作人的授权,否则可能导致版权法律纠纷,本软件对此不负任何责任。)')
+            .fontColor(this.themeColor).fontSize(14)
+            // .fontStyle(FontStyle.Italic)
+        }
           .margin({ left: 18, right: 20 })
           .fontSize(16)
           .fontColor(Color.Gray)
           .fontWeight(480)
           .layoutWeight(1)
       }
-      .height(48)
+      .height(82)
 
       Line().width('100%').height(0.3).backgroundColor($r('app.color.index_tab_unselected_font_color'))
       // 歌词API

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

@@ -2632,6 +2632,7 @@ export struct LocalMusic {
               .fontColor(this.currentSong?.filePath === item.filePath ? this.themeColor :
               $r('app.color.text_color'))
               .margin({ left: this.twoFingerType == 3 ? 6 : 8 })
+              .padding({right:25})
               .bindPopup(this.longItemFilePath === item.filePath, {
                 builder: this.MenuBuilder(item,index,item.filePath),
                 placement: Placement.Top,
@@ -2687,6 +2688,7 @@ export struct LocalMusic {
                 .fontColor(this.currentSong?.filePath === item.filePath ? this.themeColor :
                 $r('app.color.text_color'))
                 .margin({ left: this.twoFingerType == 3 ? 6 : 8 })
+                .padding({right:25})
               Blank()
               Text(item.size)
                 .fontSize(this.twoFingerType == 1 ? 11 : this.twoFingerType == 2 ? 12 : 14)
@@ -2738,7 +2740,7 @@ export struct LocalMusic {
             })
             .visibility(this.isMultiSelect ? Visibility.Visible : Visibility.None)
             .onChange((checked: boolean) => this.handleFileSelection(item, checked))
-            .margin({ left: 20, top: 8, bottom: 8 })
+            .margin({ left: 20, top: 8, bottom: 8,right:18 })
             .width(22)
             .height(22)
 
@@ -5137,7 +5139,7 @@ export struct LocalMusic {
               Text('歌词:')
                 .fontSize(14)
                 .fontColor($r('app.color.text_color'))
-                .margin({ top:5,left: 22 })
+                .margin({ top:9,left: 22 })
 
               Button({ type: ButtonType.Capsule, stateEffect: true }) {
                 SymbolGlyph($r('sys.symbol.trash_fill'))

+ 46 - 1
entry/src/main/ets/view/TagsContentCover.ets

@@ -8,7 +8,8 @@ import { changeMusicCover, findLocalCoverImage, getApiLyric, repairAudioMetadata
   searchCover,
   syncLyricToDB} from '../common/util/MusicTagUtils';
 import { util } from '@kit.ArkTS';
-import { FFMpegTags } from '../common/util/Utility';
+import { FFMpegTags, Utility } from '../common/util/Utility';
+import { DialogHelper } from '@pura/harmony-dialog';
 
 //批量编辑标签
 // 批量编辑标签
@@ -227,6 +228,46 @@ export struct TagsContentCover {
 
   }
 
+  // 会员功能弹窗
+  showVipDialog() {
+    DialogHelper.showCustomContentDialog({
+      dialogId: 'vip',
+      title: "友情提示",
+      autoCancel: false,
+      backCancel: true,
+      contentBuilder: () => {
+        this.customVipBuilder("该功能需开通会员,非常感谢您的支持!")
+      },
+      buttons: [],
+    })
+  }
+
+  @Builder
+  customVipBuilder(content: string) {
+    Column() {
+      Text(content)
+        .fontColor(Color.Gray)
+        .fontSize(16)
+        .alignSelf(ItemAlign.Start)
+        .margin({ bottom: 15 })
+      Row() {
+        Button('知道了')
+          .fontColor(Color.White)
+          .layoutWeight(1)
+          .height(50)
+          .backgroundColor(this.themeColor)
+          .stateEffect(true)
+          .margin({ left: 6 })
+          .onClick(() => {
+            DialogHelper.closeDialog('vip');
+          })
+      }
+    }
+    .width("100%")
+    .padding(10)
+  }
+
+
   /**
    * 开始嵌入封面和歌词
    */
@@ -246,6 +287,10 @@ export struct TagsContentCover {
       ToastUtil.showToast('请到设置界面配置歌词Api')
       return
     }
+    if (!Utility.isNoble()) {
+      this.showVipDialog();
+      return;
+    }
 
     this.isEmbedding = true;
     this.currentProgress = 0;