icon

entry/src/main/ets/entryability/EntryAbility.ets

@@ -19,6 +19,7 @@ import { DemoConstants } from './DemoConstants';
 import { Utility } from '../common/util/Utility';
 import { SpiderMan } from '@simplepeng/spider-man';
 import { WXApi, WXEventHandler } from '../common/util/WXApiWrap';
+import { IBestInit } from '@ibestservices/ibest-ui';
 
 /**
  * 主Ability类，继承自UIAbility
@@ -118,6 +119,7 @@ export default class EntryAbility extends UIAbility {
         //1.获取应用主窗口。
         let windowClass: window.Window | null = null;
         windowStage.getMainWindow((err: BusinessError, data) => {
+
             windowClass = data;
             // LogUtil.info( 'getMainWindow = ');
             globalThis.windowClass = data // 赋值给全局变量windowClass
@@ -136,6 +138,8 @@ export default class EntryAbility extends UIAbility {
         hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
 
         windowStage.loadContent('pages/SplashIndex', (err, data) => {
+            IBestInit(windowStage, this.context)
+
             if (err.code) {
                 hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
                 return;

entry/src/main/ets/pages/NewIndex.ets

@@ -82,7 +82,7 @@ struct NewIndex{
     .setLeftIconHeight(28)
     .setTitleBarMinHeight(64)
     .setTitleName('首页')
-    // .setRightIcon($r('app.media.add'))
+      // .setRightIcon($r('app.media.add'))
     .setTitleFontSize(19)
     .setTitleFontColor(Color.White)
     .setTitleBarBackground($r('app.color.title_bar_bg'))
@@ -95,10 +95,10 @@ struct NewIndex{
       })
     })
     .setRightTitleBackground($r('app.color.title_bar_bg'))
-    // .setOnRightClickListener(()=>{
-    //   // this.goSelectVideo()
-    //   this.showSheelDialog()
-    // })
+  // .setOnRightClickListener(()=>{
+  //   // this.goSelectVideo()
+  //   this.showSheelDialog()
+  // })
 
   /** 应用版本号 */
   @State versionName:string =''
@@ -161,22 +161,22 @@ struct NewIndex{
    * - 判断是否显示赞助入口
    */
 
-async aboutToAppear() {
-  Utility.enableFullScreen()
-  Utility.getAppName(getContext(this)).then((appName:string)=>{
-    this.appName = appName
-  })
-  this.breakpointSystem.register();
-  let params = router.getParams() as Record<string, Object>;
-  this.videoLocalList = params.videoList as VideoItem[];
-  Utility.setStatusBarLight()
-  ScreenUtil.setScreenSize();
-  this.bundleName =   AppUtil.getBundleName()
-  this.versionName =  AppUtil.getVersionName();
-  await ImageKnife.getInstance().initFileCache(this.context, 256, 256 * 1024 * 1024)
-  this.isShowSponsorship = Utility.isOpenTime()
-
-}
+  async aboutToAppear() {
+    Utility.enableFullScreen()
+    Utility.getAppName(getContext(this)).then((appName:string)=>{
+      this.appName = appName
+    })
+    this.breakpointSystem.register();
+    let params = router.getParams() as Record<string, Object>;
+    this.videoLocalList = params.videoList as VideoItem[];
+    Utility.setStatusBarLight()
+    ScreenUtil.setScreenSize();
+    this.bundleName =   AppUtil.getBundleName()
+    this.versionName =  AppUtil.getVersionName();
+    await ImageKnife.getInstance().initFileCache(this.context, 256, 256 * 1024 * 1024)
+    this.isShowSponsorship = Utility.isOpenTime()
+
+  }
 
   /**
    * 页面消失生命周期钩子
@@ -218,63 +218,63 @@ async aboutToAppear() {
 
       // 侧边抽屉菜单
       if(this.isShowDrawer){
+        Column() {
           Column() {
-            Column() {
-              // 抽屉顶部背景图
-              Image($r('app.media.bg_music'))
-                .width('100%')
-                .visibility(this.isCoverOpacity()?Visibility.None:Visibility.Visible)
-                .height(180)
-              Blank()
-                .backgroundColor($r('app.color.title_bar_bg'))
-                .visibility(this.isCoverOpacity()?Visibility.Visible:Visibility.None)
-                .width('100%')
-                .height(55)
-              // 动态生成抽屉菜单内容
-              this.getDrawerView()
-            }
-            .width(this.currentBreakpoint !== BreakpointTypeEnum.SM?'40%':'75%')
-            .height('100%')
-            .backgroundColor($r('app.color.silvery'))
-            .onClick((event:ClickEvent)=>{
-              // 阻止事件冒泡
-            })
+            // 抽屉顶部背景图
+            Image($r('app.media.bg_music'))
+              .width('100%')
+              .visibility(this.isCoverOpacity()?Visibility.None:Visibility.Visible)
+              .height(180)
+            Blank()
+              .backgroundColor($r('app.color.title_bar_bg'))
+              .visibility(this.isCoverOpacity()?Visibility.Visible:Visibility.None)
+              .width('100%')
+              .height(55)
+            // 动态生成抽屉菜单内容
+            this.getDrawerView()
           }
-          .width('100%')
+          .width(this.currentBreakpoint !== BreakpointTypeEnum.SM?'40%':'75%')
           .height('100%')
-          .backgroundColor($r('app.color.ban_touming'))
-          .alignItems(HorizontalAlign.Start)
+          .backgroundColor($r('app.color.silvery'))
           .onClick((event:ClickEvent)=>{
-            // 点击抽屉外部关闭抽屉
-            animateTo({ duration: 555 }, () => {
-              this.isShowDrawer = false
-            })
+            // 阻止事件冒泡
           })
-          .translate({ x: this.offsetX, y: 0, z: 0 })
-          .transition({ type: TransitionType.Insert, translate: { x: -DisplayUtil.getWidth(), y: 0 } })
-          .transition({ type: TransitionType.Delete, translate: { x: -DisplayUtil.getWidth(), y: 0 } })
-          .gesture(
-            PanGesture()
-              .onActionUpdate((event:GestureEvent)=>{
-                // 手势滑动更新抽屉偏移
-                if(event.offsetX<0){
-                  this.offsetX = event.offsetX;
-                }
-              })
-              .onActionEnd(() => {
-                // 手势结束判断是否关闭抽屉
-                if(this.offsetX<-DisplayUtil.getWidth()/9){
-                  animateTo({ duration: 555 }, () => {
-                    this.isShowDrawer = false
-                  })
-                }else{
-                  animateTo({ duration: 555 }, () => {
-                    this.isShowDrawer = true
-                    this.offsetX = 0
-                  })
-                }
-              })
-          )
+        }
+        .width('100%')
+        .height('100%')
+        .backgroundColor($r('app.color.ban_touming'))
+        .alignItems(HorizontalAlign.Start)
+        .onClick((event:ClickEvent)=>{
+          // 点击抽屉外部关闭抽屉
+          animateTo({ duration: 555 }, () => {
+            this.isShowDrawer = false
+          })
+        })
+        .translate({ x: this.offsetX, y: 0, z: 0 })
+        .transition({ type: TransitionType.Insert, translate: { x: -DisplayUtil.getWidth(), y: 0 } })
+        .transition({ type: TransitionType.Delete, translate: { x: -DisplayUtil.getWidth(), y: 0 } })
+        .gesture(
+          PanGesture()
+            .onActionUpdate((event:GestureEvent)=>{
+              // 手势滑动更新抽屉偏移
+              if(event.offsetX<0){
+                this.offsetX = event.offsetX;
+              }
+            })
+            .onActionEnd(() => {
+              // 手势结束判断是否关闭抽屉
+              if(this.offsetX<-DisplayUtil.getWidth()/9){
+                animateTo({ duration: 555 }, () => {
+                  this.isShowDrawer = false
+                })
+              }else{
+                animateTo({ duration: 555 }, () => {
+                  this.isShowDrawer = true
+                  this.offsetX = 0
+                })
+              }
+            })
+        )
 
 
       }
@@ -443,7 +443,7 @@ async aboutToAppear() {
                 break
 
               case MainViewModel.MENU_SHARE:
-                 this.gotoShare()
+                this.gotoShare()
                 break
             }
           })

entry/src/main/ets/pages/ScanFilePage.ets

@@ -154,6 +154,7 @@ export struct ScanFilePage{
             Image($r('app.media.file_search'))
               .width(80)
               .height(80)
+              .fillColor($r('app.color.img_color'))
               .alignSelf(ItemAlign.Center)
             //lottie动画
             Canvas(this.mainCanvasRenderingContext)

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

@@ -85,6 +85,7 @@ import { deviceInfo } from '@kit.BasicServicesKit';
 import { HSBColorPicker, HSBColorPickerLayout } from '@keke/color-picker'
 import { DEBUG } from 'BuildProfile';
 import { LrcParser } from '@sgaolei/lrc_parser';
+import { IBestIcon } from "@ibestservices/ibest-ui";
 
 const TAG = 'LocalMusic';
 
@@ -2452,6 +2453,7 @@ export struct LocalMusic {
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
           })// .opacity(this.opacityItem)
+          .fillColor($r('app.color.img_color'))
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .onClick(() => {
             this.isSearchMode = true
@@ -2467,12 +2469,14 @@ export struct LocalMusic {
             this.showRankDialog()
           })
 
-        Image(this.isGridMusic?$r('app.media.list'):$r("app.media.grid"))
+        SymbolGlyph(this.isGridMusic?$r('sys.symbol.list_bullet'):$r('sys.symbol.square_grid_2x2'))
+        .fontColor([$r('app.color.img_color')])
           .width(25)
           .animation({
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
           })
+
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .onClick(() => {
             this.isGridMusic = !this.isGridMusic
@@ -2569,6 +2573,7 @@ export struct LocalMusic {
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
           })// .opacity(this.opacityItem)
+          .fillColor($r('app.color.img_color'))
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .onClick(() => {
             this.isSearchMode = true
@@ -2579,17 +2584,20 @@ export struct LocalMusic {
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
           })
+          .fillColor($r('app.color.img_color'))
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .onClick(() => {
             this.isGridMusic = !this.isGridMusic
           })
-        Image($r("app.media.refresh"))
-          .width(25)
+        // Image($r("app.media.refresh"))
+        IBestIcon({ name: 'replay',iconSize:25,color:$r('app.color.img_color') })
+          // .width(25)
           .visibility(this.isHistory || this.isCanBack || this.isSearchMode ? Visibility.None : Visibility.Visible)
           .animation({
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
           })// .opacity(this.opacityItem)
+          // .fillColor($r('app.color.img_color'))
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .onClick(() => {
             if(this.isFavMusic){
@@ -2608,6 +2616,7 @@ export struct LocalMusic {
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
           })
+          .fillColor($r('app.color.img_color'))
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .onClick(() => {
             this.showRankDialog()
@@ -2617,12 +2626,13 @@ export struct LocalMusic {
         Image(this.isMultiSelect ? $r("app.media.cancel_multi") : $r("app.media.top_flower"))
           .width(24)
           .margin({ right: 10 })
-          .fillColor('#ff5186')// .opacity(this.opacityItem)
+          // .fillColor('#ff5186')// .opacity(this.opacityItem)
           .visibility(this.isHistory || this.isSearchMode ? Visibility.None : Visibility.Visible)
           .animation({
             duration: 666,
             curve: 'ease-in-out' // 可选动画曲线
           })
+          .fillColor($r('app.color.img_color'))
           .clickEffect({ level: ClickEffectLevel.MIDDLE })
           .onClick(() => {
             this.isMultiSelect = !this.isMultiSelect
@@ -2630,7 +2640,7 @@ export struct LocalMusic {
         Image($r("app.media.uninstall_green"))
           .width(24)
           .margin({ right: 10 })
-          .fillColor('#ff5186')
+          .fillColor($r('app.color.img_color'))
           .visibility(this.isHistory ? Visibility.Visible : Visibility.None)
           .animation({
             duration: 666,
@@ -3495,6 +3505,7 @@ export struct LocalMusic {
             .height(24)
             .width(24)
             .margin({ left: 8, right: 16 })
+            .fillColor($r('app.color.img_color'))
             .displayPriority(2)
             .onClick(() => {
               if (ArrayUtil.isNotEmpty(this.songList)) {
@@ -3520,6 +3531,7 @@ export struct LocalMusic {
               .height(32)
               .width(32)
               .displayPriority(3)
+              .fillColor($r('app.color.img_color'))
               .onClick(() => {
                 if (ArrayUtil.isNotEmpty(this.songList)) {
                   this.playOrPause()
@@ -3537,6 +3549,7 @@ export struct LocalMusic {
               right: 16,
               left: 16
             })
+            .fillColor($r('app.color.img_color'))
             .displayPriority(2)
             .onClick(() => {
               if (ArrayUtil.isNotEmpty(this.songList)) {
@@ -3551,6 +3564,7 @@ export struct LocalMusic {
             .height(24)
             .width(24)
             .displayPriority(1)
+            .fillColor($r('app.color.img_color'))
             .bindSheet($$this.isShowSheet, this.PlayListSheet(), {
               height: '95%',
               dragBar: true,

entry/src/main/ets/viewmodel/MainViewModel.ets

@@ -47,19 +47,18 @@ export  class  MainViewModel{
   getDrawerData(): Array<ItemData> {
     let drawerGridData: ItemData[] = [
 
-      new ItemData($r('app.string.local_music'), $r('app.media.music_menu'),MainViewModel.MENU_MUSIC,false),
+      new ItemData($r('app.string.local_music'), { type: 'symbol', value: $r('sys.symbol.music') }, MainViewModel.MENU_MUSIC, false),
       // new ItemData($r('app.string.media_ku'), $r('app.media.hm_playlist'),MainViewModel.MENU_MIEDIA_KU,false),
       // new ItemData($r('app.string.artist'), $r('app.media.kp_music'),MainViewModel.MENU_MIEDIA_ARTIST,false),
       // new ItemData($r('app.string.album'), $r('app.media.llq'),MainViewModel.MENU_MIEDIA_ALBUM,false),
 
-      new ItemData($r('app.string.file_scan'), $r('app.media.file_search'),MainViewModel.MENU_FILE_SCAN,false),
-      new ItemData($r('app.string.haoping'), $r('app.media.oh_haoping'),MainViewModel.MENU_HAOPING,false),
-      new ItemData($r('app.string.persion_duty'), $r('app.media.oh_duty'),MainViewModel.MENU_DUTY,false),
-
-      new ItemData($r('app.string.yszc'), $r('app.media.oh_pri'),MainViewModel.MENU_YSZC,false),
-      new ItemData($r('app.string.about_me'), $r('app.media.oh_about'),MainViewModel.MENU_ABOUT,false),
-      new ItemData($r('app.string.setting'), $r('app.media.setting_red'),MainViewModel.MENU_SETTING,false),
-      new ItemData($r('app.string.share_tt'), $r('app.media.oh_share'),MainViewModel.MENU_SHARE,false),
+      new ItemData($r('app.string.file_scan'), { type: 'symbol', value: $r('sys.symbol.doc_text_badge_magnifyingglass') },MainViewModel.MENU_FILE_SCAN,false),
+      new ItemData($r('app.string.haoping'), { type: 'symbol', value: $r('sys.symbol.flower') },MainViewModel.MENU_HAOPING,false),
+      new ItemData($r('app.string.persion_duty'),{ type: 'symbol', value: $r('sys.symbol.doc_plaintext') },MainViewModel.MENU_DUTY,false),
+      new ItemData($r('app.string.yszc'), { type: 'symbol', value: $r('sys.symbol.lock') },MainViewModel.MENU_YSZC,false),
+      new ItemData($r('app.string.about_me'), { type: 'symbol', value: $r('sys.symbol.info_shield') },MainViewModel.MENU_ABOUT,false),
+      new ItemData($r('app.string.setting'),  { type: 'symbol', value: $r('sys.symbol.gearshape') },MainViewModel.MENU_SETTING,false),
+      new ItemData($r('app.string.share_tt'),  { type: 'symbol', value: $r('sys.symbol.share') },MainViewModel.MENU_SHARE,false),
       // new ItemData($r('app.string.nor_setting'), $r('app.media.hm_gps'),MainViewModel.MENU_SETTING,false),
     ];
     return drawerGridData;
@@ -67,22 +66,16 @@ export  class  MainViewModel{
 
   getDrawerData2(): Array<ItemData> {
     let drawerGridData: ItemData[] = [
-
-      new ItemData($r('app.string.local_music'), $r('app.media.music_menu'),MainViewModel.MENU_MUSIC,false),
-      new ItemData($r('app.string.user_center'), $r('app.media.ic_public_user'),MainViewModel.MENU_USER,false),
-      // new ItemData($r('app.string.media_ku'), $r('app.media.hm_playlist'),MainViewModel.MENU_MIEDIA_KU,false),
-      // new ItemData($r('app.string.artist'), $r('app.media.kp_music'),MainViewModel.MENU_MIEDIA_ARTIST,false),
-      // new ItemData($r('app.string.album'), $r('app.media.llq'),MainViewModel.MENU_MIEDIA_ALBUM,false),
-      new ItemData($r('app.string.file_scan'), $r('app.media.file_search'),MainViewModel.MENU_FILE_SCAN,false),
-      new ItemData($r('app.string.vip'), $r('app.media.vip'),MainViewModel.MENU_VIP,false),
-      new ItemData($r('app.string.haoping'), $r('app.media.oh_haoping'),MainViewModel.MENU_HAOPING,false),
-      new ItemData($r('app.string.persion_duty'), $r('app.media.oh_duty'),MainViewModel.MENU_DUTY,false),
-
-      new ItemData($r('app.string.yszc'), $r('app.media.oh_pri'),MainViewModel.MENU_YSZC,false),
-      new ItemData($r('app.string.about_me'), $r('app.media.oh_about'),MainViewModel.MENU_ABOUT,false),
-      new ItemData($r('app.string.setting'), $r('app.media.setting_red'),MainViewModel.MENU_SETTING,false),
-      new ItemData($r('app.string.share_tt'), $r('app.media.oh_share'),MainViewModel.MENU_SHARE,false),
-      // new ItemData($r('app.string.nor_setting'), $r('app.media.hm_gps'),MainViewModel.MENU_SETTING,false),
+      new ItemData($r('app.string.local_music'), { type: 'symbol', value: $r('sys.symbol.music') }, MainViewModel.MENU_MUSIC, false),
+      new ItemData($r('app.string.user_center'), { type: 'symbol', value: $r('sys.symbol.person') }, MainViewModel.MENU_USER, false),
+      new ItemData($r('app.string.file_scan'), { type: 'symbol', value: $r('sys.symbol.doc_text_badge_magnifyingglass') },MainViewModel.MENU_FILE_SCAN,false),
+      new ItemData($r('app.string.vip'), { type: 'symbol', value: $r('sys.symbol.vip_hand') }, MainViewModel.MENU_VIP, false),
+      new ItemData($r('app.string.haoping'), { type: 'symbol', value: $r('sys.symbol.flower') },MainViewModel.MENU_HAOPING,false),
+      new ItemData($r('app.string.persion_duty'),{ type: 'symbol', value: $r('sys.symbol.doc_plaintext') },MainViewModel.MENU_DUTY,false),
+      new ItemData($r('app.string.yszc'), { type: 'symbol', value: $r('sys.symbol.lock') },MainViewModel.MENU_YSZC,false),
+      new ItemData($r('app.string.about_me'), { type: 'symbol', value: $r('sys.symbol.info_shield') },MainViewModel.MENU_ABOUT,false),
+      new ItemData($r('app.string.setting'),  { type: 'symbol', value: $r('sys.symbol.gearshape') },MainViewModel.MENU_SETTING,false),
+      new ItemData($r('app.string.share_tt'),  { type: 'symbol', value: $r('sys.symbol.share') },MainViewModel.MENU_SHARE,false),
     ];
     return drawerGridData;
   }

entry/src/main/resources/base/media/cancel_multi.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="1749740580543" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2351" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M131.657143 47.396571A47.323429 47.323429 0 0 1 179.053714 0h691.419429a153.6 153.6 0 0 1 153.6 153.6v684.105143a47.396571 47.396571 0 0 1-47.396572 47.396571h-36.132571V178.322286a95.085714 95.085714 0 0 0-95.085714-95.085715H131.145143V47.323429z m-131.657143 138.971429A47.396571 47.396571 0 0 1 47.396571 138.971429h789.942858a47.396571 47.396571 0 0 1 47.396571 47.396571v789.942857a47.396571 47.396571 0 0 1-47.396571 47.396572H47.396571a47.396571 47.396571 0 0 1-47.396571-47.396572v-789.942857z m83.675429 36.571429v717.531428h717.531428v-717.531428H84.041143z" fill="#555555" p-id="2352"></path><path d="M584.777143 384.585143l-147.748572 147.748571-147.529142-147.675428a43.373714 43.373714 0 0 0-61.366858 61.366857l147.602286 147.602286-147.529143 147.529142a43.373714 43.373714 0 1 0 61.366857 61.366858L437.028571 654.921143l147.602286 147.602286a43.373714 43.373714 0 1 0 61.366857-61.293715L498.468571 593.627429l147.602286-147.602286a43.373714 43.373714 0 1 0-61.366857-61.366857" fill="#555555" p-id="2353"></path></svg>

entry/src/main/resources/base/media/file_search.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="1749740698751" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1474" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M828.8 301.6l-184-175.2v175.2h184zM556 386.4V92H203.2c-12 0-23.2 4-31.2 12.8-8.8 8-12.8 18.4-12.8 29.6v756c0 11.2 4.8 22.4 12.8 29.6 8.8 8 19.2 12 31.2 12h617.6c12 0 23.2-4 31.2-12 8.8-8 12.8-19.2 12.8-29.6v-504H556zM203.2 8h440.8l308.8 293.6v588c0.8 33.6-13.6 66.4-38.4 88.8-25.6 24.8-56.8 36.8-93.6 36.8H203.2c-36 0-68-12.8-93.6-36.8-24.8-23.2-39.2-55.2-38.4-88.8V134.4c0-34.4 12.8-64.8 38.4-88.8S167.2 8 203.2 8z m272 824c-119.2 0-215.2-94.4-215.2-212C260 503.2 356.8 408 475.2 408c119.2 0 215.2 94.4 215.2 212S593.6 832 475.2 832z m0-63.2c84 0 152-67.2 152-148.8S559.2 472 475.2 472s-152 66.4-152 148 67.2 148.8 152 148.8z m111.2-5.6c-14.4-14.4-7.2-22.4 7.2-36 14.4-14.4 28.8-28.8 44-16l126.4 120c15.2 14.4 15.2 36.8 0.8 51.2s-36.8 15.2-52 0.8l-126.4-120z" p-id="1475"></path></svg>