继续优化UI

entry/src/main/ets/common/constants/CommonConstants.ets

@@ -161,12 +161,12 @@ export class CommonConstants {
   static readonly pathDir:string = 'file://docs/storage/Users/currentUser/'
 
 
-  static readonly musicBgList = [$r('app.media.ic_avatar10'),
-    $r('app.media.ic_avatar2'),$r('app.media.avatar'),
-    $r('app.media.ic_avatar4'),$r('app.media.ic_avatar5'),
-    $r('app.media.ic_avatar8'),$r('app.media.ic_avatar1'),
-    $r('app.media.ic_avatar8'),$r('app.media.ic_avatar9'),$r('app.media.ic_avatar10')
-  ]
+  // static readonly musicBgList = [$r('app.media.ic_avatar10'),
+  //   $r('app.media.ic_avatar2'),$r('app.media.avatar'),
+  //   $r('app.media.ic_avatar4'),$r('app.media.ic_avatar5'),
+  //   $r('app.media.ic_avatar8'),$r('app.media.ic_avatar1'),
+  //   $r('app.media.ic_avatar8'),$r('app.media.ic_avatar9'),$r('app.media.ic_avatar10')
+  // ]
 
 
 

entry/src/main/ets/common/util/AttributeModifierUtil.ets

@@ -26,7 +26,7 @@ export class ImageFancyModifier implements AttributeModifier<ImageAttribute> {
 
   applyNormalAttribute(attr: ImageAttribute): void {
     attr
-      .alt($r("app.media.avatar"))
+      .alt($r("app.media.alt"))
       .backgroundImageSize(ImageSize.Auto)
       .borderRadius(this.borderRadius)
       .width(this.width)

entry/src/main/ets/common/util/Utility.ets

@@ -25,6 +25,8 @@ import { VipData } from '../../viewmodel/VipData';
 import { VipPage } from '../../pages/VipPage';
 import { FFmpeg, FFProgressMessageParser } from '@sj/ffmpeg';
 import ReqPermissionUtil from './ReqPermissionUtil';
+import { commentManager } from '@kit.AppGalleryKit';
+import { hilog } from '@kit.PerformanceAnalysisKit';
 
 
 export interface FFMpegTags {
@@ -1080,6 +1082,29 @@ export class Utility {
 
   static gotoMarket(context:common.UIAbilityContext,bundleName:string) {
 
+    const isAvailable = canIUse('SystemCapability.AppGalleryService.Distribution.Comment');
+    if(isAvailable) {
+      try {//需要api 20 才可以调用用户评论对话框showCommentDialog
+        commentManager.showCommentDialog(context).then(()=>{
+          hilog.info(0, 'TAG', "succeeded in showing commentDialog.");
+          return
+        }).catch((error: BusinessError<Object>) => {
+          Utility.goMarket(context,bundleName)
+          hilog.error(0, 'TAG', `showCommentDialog failed, Code: ${error.code}, message: ${error.message}`);
+        });
+      } catch (error) {
+        Utility.goMarket(context,bundleName)
+        hilog.error(0, 'TAG', `showCommentDialog failed, Code: ${error.code}, message: ${error.message}`);
+      }
+
+    }else{
+      Utility.goMarket(context,bundleName)
+    }
+
+
+  }
+
+  static async goMarket(context:common.UIAbilityContext,bundleName:string){
     const want: Want = {
       uri: `store://appgallery.huawei.com/app/detail?id=${bundleName}`
     };
@@ -1089,7 +1114,6 @@ export class Utility {
     }).catch(()=>{
       // 拉起失败
     });
-
   }
 
   static async  doShare(item:VideoItem,context:common.UIAbilityContext){
@@ -1341,23 +1365,6 @@ export class Utility {
   }
 
 
-  static getMusisBg():Resource {
-
-    let index = RandomUtil.randomNumber(0,9)
-    LogUtil.info('getMusisBg index = '+index)
-    return CommonConstants.musicBgList[index]
-
-  }
-
-  static getMusisBg2(index:number):Resource {
-    const adjustedIndex = index % 10;
-    LogUtil.info('getMusisBg adjustedIndex = '+adjustedIndex)
-    return CommonConstants.musicBgList[adjustedIndex]
-
-  }
-
-
-
 
   static getParentDirectory(filePath: string): string {
     // 使用正则表达式匹配路径分隔符（支持 Unix 和 Windows）

entry/src/main/ets/common/util/WebdavManager.ets

@@ -964,6 +964,8 @@ export class WebdavManager {
 
   // 是否可以返回上级
   public canGoBack(): boolean {
+    if(this.currentPath==='/')
+      return false
     return this.pathHistory.length > 0;
   }
 

entry/src/main/ets/controller/AvSessionController.ets

@@ -108,7 +108,7 @@ export class AvSessionController {
       return;
     }
     BackgroundTaskManager.startContinuousTask(this.context);
-    const imagePixMap = await ImageUtil.getPixelMapFromMedia($r('app.media.ic_avatar8'));
+    const imagePixMap = await ImageUtil.getPixelMapFromMedia($r('app.media.ic_avatar1'));
     let metadata: avSession.AVMetadata = {
       assetId: `${curSource.filePath}`,
       title: curSource.name,
@@ -145,7 +145,7 @@ export class AvSessionController {
           imagePixMap = await imagePathToPixelMap(pixelMapPath)
         }
       }else{
-        imagePixMap = await ImageUtil.getPixelMapFromMedia($r('app.media.ic_avatar2'));
+        imagePixMap = await ImageUtil.getPixelMapFromMedia($r('app.media.ic_avatar1'));
       }
       let lyric = ''
       if(lyricContent)

entry/src/main/ets/pages/WebDavMainPage.ets

@@ -478,6 +478,8 @@ export struct WebDavMainPage {
       this.webdavManager.navigateToBreadcrumb(breadcrumbIndex).then((path: string) => {
         this.webdavManager.enterFolderFromPath(path)
         this.breadcrumbs = this.webdavManager.getBreadcrumbs();
+        console.info('onecold this.breadcrumbs = ' + JSON.stringify(this.breadcrumbs))
+        console.info('onecold this.webdavManager.currentPath = ' + this.webdavManager.currentPath)
       })
         .catch((error: Error) => {
           Logger.error(TAG, '导航到面包屑路径失败: ' + error.message);

entry/src/main/ets/view/LocalMusic.ets

@@ -234,6 +234,9 @@ const ITEM_HEIGHT_BIG: number = 78; // 列表项大高度
 @Preview
 @Component
 export struct LocalMusic {
+  // @State button_gradient_state: hdsEffect.PressShadowType = hdsEffect.PressShadowType.NONE;
+  // @State lightIntensity: number = 10;
+  // @State illuminatedType: hdsEffect.PointLightIlluminatedType = hdsEffect.PointLightIlluminatedType.NONE
   //背景两侧流光控制器
   @State sceneBgController: HdsSceneController|undefined = deviceInfo.sdkApiVersion>=20
     &&canIUse("SystemCapability.UIDesign.HDSComponent.Core")?
@@ -4128,8 +4131,6 @@ export struct LocalMusic {
     let mSearchList: Array<VideoItem> = []
     switch (this.modeType) {
       case 0:
-        // mSearchList = this.videoLocalList
-        // break;
       case 1:
         mSearchList = this.mediaKuList
         break;
@@ -4139,6 +4140,10 @@ export struct LocalMusic {
       case 3:
         mSearchList = this.albumList
         break;
+      default :
+        mSearchList = this.videoLocalList
+        break;
+
     }
     // 新增条件判断：空输入时显示所有数据
     if (this.searchText === '') {
@@ -4412,7 +4417,7 @@ export struct LocalMusic {
     Button({ type: ButtonType.Normal, stateEffect: false }) {
       Stack() {
         Column() {
-          Image(StrUtil.isEmpty(item.pixelMapPath) ? Utility.getMusisBg2(index) : item.pixelMapPath)
+          Image(item.pixelMapPath)
             .backgroundImageSize(ImageSize.Auto)
             .borderRadius({
               topLeft: 12,
@@ -4421,10 +4426,11 @@ export struct LocalMusic {
               bottomRight: 0
             })
             .draggable(false)// 禁止长按手势拖动
-            // .autoResize(true) // 重采样，可减少内存占用
-            // .interpolation(ImageInterpolation.High)// 用于重采样后的抗锯齿
+            .autoResize(true) // 重采样，可减少内存占用
+            .interpolation(ImageInterpolation.High)// 用于重采样后的抗锯齿
             .width('100%')
             .height('auto')
+            .alt(item.type==CommonConstants.TYPE_IS_DIR?$r('app.media.dir_alt'):$r('app.media.alt'))
             .objectFit(ImageFit.Auto)
             .bindSheet(this.longItemFilePath== item.filePath, this.editSheet(item), {
               height:  '99%' ,
@@ -4534,7 +4540,7 @@ export struct LocalMusic {
         }
         .width('100%')
         .borderRadius(12)
-        .backgroundImage(StrUtil.isEmpty(item.pixelMapPath)?Utility.getMusisBg2(index):item.pixelMapPath)
+        .backgroundImage(StrUtil.isEmpty(item.pixelMapPath) ? $r('app.media.alt') : item.pixelMapPath)
         .backgroundImageSize({ height: '100%', width: '100%' })
         .backgroundBlurStyle(BlurStyle.BACKGROUND_ULTRA_THICK)
         .animation({ curve: Curve.Sharp, duration: 300 })
@@ -4561,6 +4567,11 @@ export struct LocalMusic {
     .width('100%')
     .height('auto')
     .padding({top:2})
+    .shadow({
+      radius: 10,
+      type: ShadowType.BLUR,
+      color: 'on_primary'
+    })
     .reuseId('card_item')
     .onClick(() => {
       if (this.isMultiSelect && item.type !== CommonConstants.TYPE_IS_DIR) {
@@ -4806,13 +4817,13 @@ export struct LocalMusic {
     Button({ type: ButtonType.Normal, stateEffect: false }) {
       Stack() {
         Column() {
-          Image(StrUtil.isEmpty(item.pixelMapPath) ? Utility.getMusisBg2(index) : item.pixelMapPath)
+          Image(item.pixelMapPath)
             .height(this.getGridHeight())
             .width(this.getGridWight())
             .draggable(false)
             .interpolation(ImageInterpolation.High)// 用于重采样后的抗锯齿
             .autoResize(true) // 重采样，可减少内存占用
-            .alt($r('app.media.ic_avatar2'))
+            .alt(item.type==CommonConstants.TYPE_IS_DIR?$r('app.media.dir_alt'):$r('app.media.alt'))
             .clip(true)
             .borderRadius({
               topLeft: 12,
@@ -4924,7 +4935,7 @@ export struct LocalMusic {
         }
         .width(this.getGridWight())
         .borderRadius(12)
-        .backgroundImage(StrUtil.isEmpty(item.pixelMapPath)?Utility.getMusisBg2(index):item.pixelMapPath)
+        .backgroundImage(StrUtil.isEmpty(item.pixelMapPath)?undefined:item.pixelMapPath)
         .backgroundImageSize({ height: '100%', width: '100%' })
         .backgroundBlurStyle(BlurStyle.BACKGROUND_ULTRA_THICK)
         .animation({ curve: Curve.Sharp, duration: 300 })
@@ -5707,10 +5718,10 @@ export struct LocalMusic {
         if (item.name === LocalMusic.STR_LOCK_VIDEO) {
           this.showVerifyDialog()
           this.currentTitleName = '私密音频'
-          this.currentTitleCover = $r('app.media.ic_avatar5')
+          this.currentTitleCover = $r('app.media.ic_avatar1')
         } else if (item.name === LocalMusic.STR_HISTORY_MUSIC) {
           this.titleName = '最近播放'
-          this.currentTitleCover = $r('app.media.ic_avatar2')
+          this.currentTitleCover = $r('app.media.alt')
           this.currentTitleName = '最近播放'
           //加载动画效果
           this.updateListData(this.historyList, true)
@@ -5737,7 +5748,7 @@ export struct LocalMusic {
         } else {
           this.currentTitleName = item.name
           this.currentPath = item.filePath
-          this.currentTitleCover = $r('app.media.ic_avatar5')
+          this.currentTitleCover = $r('app.media.ic_avatar1')
           this.getSortedFiles(this.currentPath)
 
         }
@@ -8353,13 +8364,6 @@ export struct LocalMusic {
 
           })
           .indicator(false)
-          // .indicator(this.currentBreakpoint === BreakpointTypeEnum.SM ?
-          //   new DotIndicator()
-          //     .top(this.isCoverOpacity()?0:10)
-          //
-          //     .selectedColor($r('app.color.select_swiper'))
-          //     .color($r('app.color.slider_track')):false
-          // )
           .displayCount(new BreakpointType({
             sm: 1,
             md: 2,
@@ -8398,14 +8402,14 @@ export struct LocalMusic {
       .margin({ bottom: 8 })
 
     }
-    .backgroundImage(!this.isMusicBGCover?undefined:
-      StrUtil.isEmpty(this.cover) ? this.imageLabel : this.cover)
+    .backgroundImage(!this.isMusicBGCover||StrUtil.isEmpty(this.cover)?null: this.cover)
     .backgroundImageSize(this.isPuraWP()||!this.isMusicBGCover ? { width: '100%' } : { height: '150%', width: '100%' })
     .animation({
       duration: 666,
       curve: 'ease-in-out' // 可选动画曲线
     })
-    .backgroundBlurStyle(this.isPuraWP() && this.currentSwiperIndex === 0 ? BlurStyle.NONE :
+    .backgroundBlurStyle((this.isPuraWP() && this.currentSwiperIndex === 0) ||!this.isMusicBGCover
+      ? BlurStyle.NONE :
     BlurStyle.BACKGROUND_ULTRA_THICK)
     .hitTestBehavior(HitTestMode.Transparent)
     .backgroundBrightness({ rate: this.isPuraWP() ? 0.1 : 0, lightUpDegree: -0.1 })
@@ -8493,8 +8497,6 @@ export struct LocalMusic {
   private castSeek: boolean = false;
   private castItem: avSession.AVQueueItem | undefined = undefined;
   // @State isBgPlayOpen:boolean = true   //是否启用后台播放
-  @State imageLabel: PixelMap | Resource = CommonConstants.musicBgList[0];
-  @State imageLabelBg: PixelMap | Resource = CommonConstants.musicBgList[0];
   @State rotateAngle2: number = -9
   @StorageLink('imageColor') imageColor: string = 'rgba(0, 0, 2, 1.00)';
   @State cover: string | undefined = '';
@@ -8913,87 +8915,6 @@ export struct LocalMusic {
 
   }
 
-  /**
-   * Get largest proportion color of an image.
-   */
-  getImageColor() {
-    if (!this.context) {
-      return;
-    }
-    let bg = Utility.getMusisBg()
-    this.imageLabel = bg
-
-    ColorConversion.setSysBarLightBackground(true);
-    this.context.resourceManager.getMediaContent(bg)
-      .then((value: Uint8Array) => {
-        let buffer = value.buffer as ArrayBuffer;
-        image.createImageSource(buffer).createPixelMap().then((pixelMap) => {
-          effectKit.createColorPicker(pixelMap, (error, colorPicker) => {
-            if (error) {
-              Logger.error('Failed to create color picker.');
-            } else {
-              let color = colorPicker.getLargestProportionColor();
-              let colorArr = ColorConversion.dealColor(color.red, color.green, color.blue);
-              this.imageColor = `rgba(${colorArr[0]}, ${colorArr[1]}, ${colorArr[2]}, 1)`;
-            }
-          })
-          let headFilter = effectKit.createEffect(pixelMap);
-          if (headFilter !== null) {
-            headFilter.blur(15);
-            headFilter.getEffectPixelMap().then((value) => {
-              this.imageLabelBg = value;
-
-            })
-          }
-        })
-          .catch((error: BusinessError) => {
-            Logger.error(`${error.code} + ${error.message}`)
-          })
-      })
-      .catch((error: BusinessError) => {
-        Logger.error(`${error.code} + ${error.message}`)
-      })
-  }
-
-  setImageColor(cover: string) {
-
-    if (!this.context) {
-      return;
-    }
-    if (cover === undefined) {
-      return;
-    }
-    imagePathToPixelMap(cover).then((value) => {
-      let headFilter = effectKit.createEffect(value);
-      if (headFilter !== null) {
-        headFilter.blur(15);
-        headFilter.getEffectPixelMap().then((value) => {
-          this.imageLabelBg = value;
-
-        })
-      }
-    }).catch((error: BusinessError) => {
-      Logger.error(`${error.code} + ${error.message}`)
-    })
-
-
-  }
-
-  setImageColor2(cover: string) {
-    if (!this.context) {
-      return;
-    }
-    if (cover === undefined) {
-      return;
-    }
-    LogUtils.getInstance().LOGI("setImageColor2--> cover ==" + cover);
-    ImageUtils.getImageDealData(getContext(this), cover, this.videoUrl).then((data) => {
-      this.imageColor = data.imageColor;
-      if (data.blurPixelMap) {
-        this.imageLabelBg = data.blurPixelMap;
-      }
-    })
-  }
 
   // 定义开始旋转的方法
   // 定时器用于一百毫秒执行一次旋转角度
@@ -9070,10 +8991,10 @@ export struct LocalMusic {
     Row() {
       Stack() {
 
-        Image(StrUtil.isEmpty(this.cover) ? this.imageLabel : this.cover)
+        Image(this.cover)
           .height(58)
           .width(58)
-          .alt(this.imageLabel)
+          .alt($r('app.media.alt'))
           .borderRadius(8)
           .clickEffect({ level: ClickEffectLevel.HEAVY })
           .margin({ left: this.currentLyricAlignMode === 0 ? 28 : -15 })
@@ -9269,6 +9190,8 @@ export struct LocalMusic {
             .clickEffect({level:ClickEffectLevel.HEAVY})
             .aspectRatio(CommonConstants.ASPECT_RATIO)
         }
+        .height(50)
+        .width(50)
         .onClick(async () => {
           await this.playPrevious()
         })
@@ -9288,32 +9211,44 @@ export struct LocalMusic {
             .clickEffect({level:ClickEffectLevel.LIGHT, scale: 0.5})
             .fillColor(Color.White)
             .aspectRatio(CommonConstants.ASPECT_RATIO)
-            .onClick(async () => {
-              console.info('onecold playOrPause 7651')
-              this.playOrPause()
-            })
         }
 
       }
+      // .visualEffect(new hdsEffect.HdsEffectBuilder()
+      //   .pressShadow(this.button_gradient_state)
+      //   .pointLight({
+      //     options: {
+      //       color: Color.White,
+      //       intensity: this.lightIntensity,
+      //       height: 150
+      //     }
+      //   })
+      //   .pressShadow(this.button_gradient_state)
+      //   .buildEffect())
+      .onClick(async () => {
+        this.playOrPause()
+        // this.illuminatedType = hdsEffect.PointLightIlluminatedType.BORDER;
+        // this.button_gradient_state = hdsEffect.PressShadowType.BLEND_GRADIENT;
+      })
       .backgroundColor(Color.Transparent)
       .layoutWeight(1)
       // .margin({ left: 38, right: 38 })
 
 
       Row({ space: 20 }) {
-        Button({ type: ButtonType.Capsule, stateEffect: true }) {
+        Button({ type: ButtonType.Circle, stateEffect: true }) {
           Image($r('app.media.ic_next'))
             .width(33)
             .clickEffect({level:ClickEffectLevel.LIGHT, scale: 0.5})
             .aspectRatio(CommonConstants.ASPECT_RATIO)
-            .onClick(async () => {
-
-              await this.playNext();
-
-            })
         }
+        .height(50)
+        .width(50)
         .backgroundColor(Color.Transparent)
         .margin({ right: 5 })
+        .onClick(async () => {
+          await this.playNext();
+        })
         .width(33)
 
 
@@ -9763,11 +9698,11 @@ export struct LocalMusic {
 
         Column() {
           if (this.isCoverTop && !this.isCoverOpacity() && this.isCoverRectangle) {
-            Image(StrUtil.isEmpty(this.cover) ? this.imageLabel : this.cover)
+            Image(this.cover)
               .height(this.isHiCar()?(px2vp(this.windowHeight)*0.46):'auto')
               .width(this.isHiCar()?'auto':this.isBigScreen() ? '72%' : this.isCoverTopBig ? '100%' : '88%')
               .objectFit(this.isCoverRectangle ? ImageFit.Contain : ImageFit.Auto)
-              .alt(this.imageLabel)
+              .alt($r('app.media.alt'))
               .margin({ right: 8, left: 8, top: 8 })
               .aspectRatio(1)
               .opacity(this.opacityValueImage)
@@ -9789,7 +9724,7 @@ export struct LocalMusic {
                 color: 'on_primary'
               })
               .onClick(() => {
-                this.getImageColor()
+
               })
               // .visualEffect(new hdsEffect.HdsEffectBuilder()
               //   .shaderEffect({
@@ -9822,11 +9757,11 @@ export struct LocalMusic {
 
             this.musicNameInfo(false)
           } else {
-            Image(StrUtil.isEmpty(this.cover) ? this.imageLabel : this.cover)
+            Image(this.cover)
               .height(this.isHiCarSmall()?(this.isHiCarKuanBianPing()?140:px2vp(this.windowHeight)*0.38):
                 (this.isCoverOpacity() ? (px2vp(this.windowHeight)*0.62) : this.isCoverRectangle ? 320 : 162))
               .objectFit(this.isCoverRectangle ? ImageFit.Contain : ImageFit.Auto)
-              .alt(this.imageLabel)
+              .alt($r('app.media.alt'))
               .margin({ right: 20, left: 20,top:this.isCoverRectangle||this.isLandscape?0:43 })
               .aspectRatio(1)
               .opacity(this.opacityValueImage)
@@ -9848,7 +9783,7 @@ export struct LocalMusic {
                 angle: this.rotateAngle
               })
               .onClick(() => {
-                this.getImageColor()
+
               })
             if (this.isPhoneLan()) {
               Text(this.name)
@@ -12379,16 +12314,6 @@ export struct LocalMusic {
       onPrepared: async () => {
         LogUtils.getInstance().LOGI("setOnPreparedListener-->go");
         try {
-          // this.cover = this.songList[this.curIndex].pixelMapPath
-          // this.artist = this.songList[this.curIndex].artist
-          // this.videoUrl = this.songList[this.curIndex].filePath
-
-          let isBgCover = PreferencesUtil.getBooleanSync(SettingPage.iS_MUSIC_BG_COVER, true)
-          if (isBgCover && this.cover !== undefined && StrUtil.isNotEmpty(this.cover)) {
-            this.setImageColor2(this.cover)
-          } else {
-            this.getImageColor();
-          }
           //保存碰一碰分享的当前的歌曲
           AppStorage.setOrCreate('currentSong',this.currentSong) ;