合并master

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

@@ -143,12 +143,12 @@ export class AvSessionController {
         if(pixelMapPath.startsWith('http')){
           imagePixMap =pixelMapPath
         }else{
-          imagePixMap = await ImageUtil.imagePathToPixelMap(pixelMapPath)
+          imagePixMap = await ImageUtils.imagePathToPixelMap(pixelMapPath)
         }
         } else {
-          imagePixMap = await ImageUtils.imagePathToPixelMap(pixelMapPath)
+          imagePixMap = await ImageUtils.imagePathToPixelMap(pixelMapPath as string)
         }
-      }
+
       let lyric = ''
       if (lyricContent) {
         lyric = LyricUtil.convertLyricToSimpleLrc(lyricContent)

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

@@ -19,7 +19,6 @@ import { WXApi, WXEventHandler } from '../common/util/WXApiWrap';
 import { UnifiedPlayerService } from '../common/service/UnifiedPlayerService';
 import { WidgetRegistrationFix } from '../common/widget/WidgetRegistrationFix';
 import { systemShare } from '@kit.ShareKit';
-import { SpiderMan } from '@simplepeng/spider-man';
 import { CustomCrashHandler } from '../common/utils/CustomCrashHandler';
 import { smartMobilityCommon } from '@kit.CarKit';
 import { url } from '@kit.ArkTS';

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

@@ -7653,7 +7653,7 @@ export struct LocalMusic {
               this.mDestroyPage = false;
               this.showLoadIng();
               LogUtils.getInstance().LOGI("slider-->seekValue start:" + value);
-              let seekValue = value * (this.mIjkMediaPlayer.getDuration() / 100);
+              let seekValue = value * ((this.unifiedPlayerService.getIjkPlayer() as IjkMediaPlayer)?.getDuration() / 100);
               this.seekTo(seekValue + "");
               // this.setProgress()
               LogUtils.getInstance().LOGI("slider-->seekValue end:" + seekValue);

oh-package.json5

@@ -21,7 +21,6 @@
     "@cashier_alipay/cashiersdk": "^15.8.32",
     "@keke/color-picker": "^1.0.4",
     "@ohos/pinyin4js": "^2.0.2",
-    "@simplepeng/spider-man": "^1.0.1",
     "@ohos/juniversalchardet": "^2.0.2",
     "@sj/ffmpeg": "^1.2.5",
     "@ohos/lottie": "^2.0.23"