Parcourir la source

修复UI问题

onecold il y a 8 mois
Parent
commit
f274dfaf1d

+ 1 - 2
entry/src/main/ets/entryability/EntryAbility.ets

@@ -11,7 +11,7 @@
 import UIAbility from '@ohos.app.ability.UIAbility';
 import hilog from '@ohos.hilog';
 import window from '@ohos.window';
-import { AbilityConstant, Want } from '@kit.AbilityKit';
+import { AbilityConstant, appRecovery, Want } from '@kit.AbilityKit';
 import { BusinessError, emitter } from '@kit.BasicServicesKit';
 import { AppUtil, ArrayUtil, GlobalContext, LogUtil, StrUtil } from '@pura/harmony-utils';
 import { DemoConstants } from './DemoConstants';
@@ -29,7 +29,6 @@ import { smartMobilityCommon } from '@kit.CarKit';
 import { url } from '@kit.ArkTS';
 import { display } from '@kit.ArkUI';
 import { ServerLogUtil } from '../common/util/ServerLogUtil';
-
 /**
  * 主Ability类,继承自UIAbility
  * 负责:

+ 1 - 1
entry/src/main/ets/view/DeleteComptent.ets

@@ -51,7 +51,7 @@ export struct DeleteComptent {
               .maxLines(2)
               .textOverflow({ overflow: TextOverflow.Ellipsis })
               .width('90%')
-              .textAlign(TextAlign.Center)
+              .textAlign(TextAlign.Start)
               .margin({ bottom: 15 })
           }
 

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

@@ -3920,10 +3920,10 @@ export struct LocalMusic {
 
         }
         if (!this.isSearchMode) {
-          Text(this.titleName)
+          Text(this.modeType==1?`${this.titleName}(${this.mediaKuCount}首)`:this.titleName)
             .margin({left:3,right:10})
             .fontColor($r('app.color.text_color'))
-            .fontSize(this.twoFingerType==3?19:this.twoFingerType==2?17:15)
+            .fontSize(this.twoFingerType==3?17:16)
             .maxLines(1)
             .textOverflow({ overflow: TextOverflow.MARQUEE })//超长滚动
             .layoutWeight(1)
@@ -6033,7 +6033,7 @@ export struct LocalMusic {
                 curve: 'Linear',
               })
               .bindSheet(this.longItemFilePathDetail== item.filePath, this.detailSheet(item), {
-                height:  '95%',
+                height:  '100%',
                 dragBar: true,
                 showClose: true,
                 onDisappear: () => {
@@ -6393,7 +6393,7 @@ export struct LocalMusic {
               content: $r('app.string.detail')
             })
               .bindSheet($$this.isShowDetail, this.detailSheet(item), {
-                height:'95%',
+                height:'100%',
                 dragBar: true,
                 showClose: true,
                 blurStyle:BlurStyle.Thin,
@@ -9238,7 +9238,7 @@ export struct LocalMusic {
       TransitionEffect.opacity(1),
       TransitionEffect.OPACITY
     ))
-    .visualEffect(deviceInfo.sdkApiVersion>=20&&this.bgController?
+    .visualEffect(!this.isMusicBGCover&&deviceInfo.sdkApiVersion>=20&&this.bgController?
       new hdsEffect.HdsEffectBuilder()
         .shaderEffect({
           effectType: hdsEffect.EffectType.UV_BACKGROUND_FLOW_LIGHT,
@@ -10273,13 +10273,13 @@ export struct LocalMusic {
             this.isLyricSetting = !this.isLyricSetting;
           })
           .bindSheet($$this.isLyricSetting, this.lyricSettingSheet(false), {
-            height:  '95%',
+            height:  '99%',
             dragBar: true,
-            preferType: this.currentBreakpoint !== BreakpointTypeEnum.SM ? SheetType.CENTER : SheetType.BOTTOM,
+            preferType: SheetType.CENTER,
             showClose: true,
             blurStyle: BlurStyle.Thin,
             backgroundColor: Color.Transparent,
-            // title: { title: $r('app.string.lyric_setting') }
+            title: { title: $r('app.string.lyric_setting') }
           })
 
 
@@ -10395,10 +10395,11 @@ export struct LocalMusic {
           .clickEffect({level:ClickEffectLevel.LIGHT, scale: 0.5})
           .bindSheet($$this.isShowMoreView, this.PlayMoreSheet(), {
             height:  '99%',
-            preferType: this.currentBreakpoint!==BreakpointTypeEnum.SM?SheetType.CENTER:SheetType.BOTTOM,
+            preferType:SheetType.CENTER,
             dragBar: true,
             showClose: true,
             blurStyle: BlurStyle.Thin,
+            title: { title: $r('app.string.more') },
             backgroundColor: Color.Transparent,
           })
       }
@@ -12248,7 +12249,7 @@ export struct LocalMusic {
                   .fontSize(16)
                   .fontColor(Color.White)
                   .bindSheet($$this.isShowDetailMore, this.detailSheet(this.currentSong), {
-                    height: this.isCoverOpacity() ? '95%' : '95%',
+                    height: '99%',
                     dragBar: true,
                     preferType: this.currentBreakpoint !== BreakpointTypeEnum.SM ? SheetType.CENTER : SheetType.BOTTOM,
                     showClose: true,
@@ -12300,9 +12301,9 @@ export struct LocalMusic {
                   .fontSize(16)
                   .fontColor(Color.White)
                   .bindSheet($$this.showPipLyric, this.lyricSettingSheet(true), {
-                    height: this.isCoverOpacity() ? '95%' : '95%',
+                    height:  '99%',
                     dragBar: true,
-                    preferType: this.currentBreakpoint !== BreakpointTypeEnum.SM ? SheetType.CENTER : SheetType.BOTTOM,
+                    preferType: SheetType.CENTER,
                     showClose: true,
                     blurStyle: BlurStyle.Thin,
                     backgroundColor: Color.Transparent,

+ 8 - 0
entry/src/main/resources/base/element/string.json

@@ -706,6 +706,14 @@
     {
       "name": "upload_music_file",
       "value": "上传音乐文件"
+    },
+    {
+      "name": "more",
+      "value": "更多功能"
+    },
+    {
+      "name": "lyric_setting",
+      "value": "歌词设置"
     }
 
   ]