Răsfoiți Sursa

去掉之前的用的只支持部分格式读取内嵌歌词的第三方包

onecold 1 an în urmă
părinte
comite
b2d88189af
3 a modificat fișierele cu 7 adăugiri și 29 ștergeri
  1. 0 3
      entry/src/main/ets/view/LocalMusic.ets
  2. 5 23
      oh-package-lock.json5
  3. 2 3
      oh-package.json5

+ 0 - 3
entry/src/main/ets/view/LocalMusic.ets

@@ -71,7 +71,6 @@ import { resourceManager } from '@kit.LocalizationKit';
 import { deviceInfo } from '@kit.BasicServicesKit';
 
 import { HSBColorPicker, HSBColorPickerLayout } from '@keke/color-picker'
-import { LrcParser } from '@sgaolei/lrc_parser';
 import app from '@system.app';
 import { TextNodeController } from './PipLyricTextBuilder';
 import { IndexerView } from './IndexerView';
@@ -6372,8 +6371,6 @@ export struct LocalMusic {
     let lyContent = this.currentSong?.lyricContent
     if(lyContent&&StrUtil.isNotEmpty(lyContent)){//取数据库里面的歌词lyContent
        neiqianLrc = lyContent
-    }else{
-       neiqianLrc = LrcParser.getLyrics(this.videoUrl); //获取内嵌歌词
     }
     if (StrUtil.isNotEmpty(neiqianLrc) && !isOnLineAndToast) {
       console.log("onecold 找到内嵌歌词 neiqianLrc =" + neiqianLrc)

+ 5 - 23
oh-package-lock.json5

@@ -12,21 +12,19 @@
     "@chinalike/popup@^0.0.7": "@chinalike/popup@0.0.7",
     "@keke/color-picker@^1.0.4": "@keke/color-picker@1.0.4",
     "@ohos/juniversalchardet@^2.0.2": "@ohos/juniversalchardet@2.0.2",
-    "@ohos/lottie@^2.0.19": "@ohos/lottie@2.0.19",
+    "@ohos/lottie@^2.0.23": "@ohos/lottie@2.0.23",
     "@ohos/pinyin4js@^2.0.2": "@ohos/pinyin4js@2.0.2",
     "@ohos/pulltorefresh@^2.1.1": "@ohos/pulltorefresh@2.1.1",
     "@pura/harmony-dialog@^1.0.6": "@pura/harmony-dialog@1.0.6",
     "@pura/harmony-utils@^1.2.4": "@pura/harmony-utils@1.2.4",
     "@pura/spinkit@^1.0.4": "@pura/spinkit@1.0.4",
     "@seagazer/cclyric@lib": "@seagazer/cclyric@lib",
-    "@sgaolei/lrc_parser@^1.0.0": "@sgaolei/lrc_parser@1.0.0",
     "@simplepeng/spider-man@^1.0.1": "@simplepeng/spider-man@1.0.1",
     "@sj/ffmpeg@^1.2.5": "@sj/ffmpeg@1.2.5",
     "@taobao-ohos/utdid_sdk@oh_modules/.ohpm/@cashier_alipay+cashiersdk@15.8.32/oh_modules/@cashier_alipay/cashiersdk/lib/utdid_sdk-1.0.9.har": "@taobao-ohos/utdid_sdk@oh_modules/.ohpm/@cashier_alipay+cashiersdk@15.8.32/oh_modules/@cashier_alipay/cashiersdk/lib/utdid_sdk-1.0.9.har",
     "class-transformer@^0.5.1": "class-transformer@0.5.1",
     "libblueshield.so@oh_modules/.ohpm/@alipay+blueshieldsdk@cow+0gass5tzqhymzjby2f6sd+g2xtoatqsiyvi9qsy=/oh_modules/@alipay/blueshieldsdk/src/main/cpp/types/libblueshield": "libblueshield.so@oh_modules/.ohpm/@alipay+blueshieldsdk@cow+0gass5tzqhymzjby2f6sd+g2xtoatqsiyvi9qsy=/oh_modules/@alipay/blueshieldsdk/src/main/cpp/types/libblueshield",
     "libffmpeg.so@oh_modules/.ohpm/@sj+ffmpeg@1.2.5/oh_modules/@sj/ffmpeg/src/main/cpp/types/libffmpeg": "libffmpeg.so@oh_modules/.ohpm/@sj+ffmpeg@1.2.5/oh_modules/@sj/ffmpeg/src/main/cpp/types/libffmpeg",
-    "liblrcparser.so@oh_modules/.ohpm/@sgaolei+lrc_parser@1.0.0/oh_modules/@sgaolei/lrc_parser/src/main/cpp/types/liblrcparser": "liblrcparser.so@oh_modules/.ohpm/@sgaolei+lrc_parser@1.0.0/oh_modules/@sgaolei/lrc_parser/src/main/cpp/types/liblrcparser",
     "pako@^2.1.0": "pako@2.1.0"
   },
   "packages": {
@@ -79,11 +77,11 @@
       "resolved": "https://repo.harmonyos.com/ohpm/@ohos/juniversalchardet/-/juniversalchardet-2.0.2.har",
       "registryType": "ohpm"
     },
-    "@ohos/lottie@2.0.19": {
+    "@ohos/lottie@2.0.23": {
       "name": "@ohos/lottie",
-      "version": "2.0.19",
-      "integrity": "sha512-6YGMeuHCdJ4PrJGPj3ycJob61TYbEcgk4GugbcuTGS6eJHJpDUuTja9lPhDmD6RL/etm3i2j4IVd+QCpfI6TWA==",
-      "resolved": "https://repo.harmonyos.com/ohpm/@ohos/lottie/-/lottie-2.0.19.har",
+      "version": "2.0.23",
+      "integrity": "sha512-SiVmsyllXLcvSrh98qsXtjSoVaxy1bm8sGZzmz94DZOjdQ2zSCnTzY627EevkCCFxAA5HIbqFPUWokhc8bp/3Q==",
+      "resolved": "https://repo.harmonyos.com/ohpm/@ohos/lottie/-/lottie-2.0.23.har",
       "registryType": "ohpm"
     },
     "@ohos/pinyin4js@2.0.2": {
@@ -133,16 +131,6 @@
       "resolved": "lib",
       "registryType": "local"
     },
-    "@sgaolei/lrc_parser@1.0.0": {
-      "name": "@sgaolei/lrc_parser",
-      "version": "1.0.0",
-      "integrity": "sha512-JnkArqOidM0qN+Daoxka+PvMq4Eqyv39/oZ/4vHTYlU5ssCTUqJ0GWF7ti9ZQTrDbg89Shx6hjODVXhs3IjgAg==",
-      "resolved": "https://repo.harmonyos.com/ohpm/@sgaolei/lrc_parser/-/lrc_parser-1.0.0.har",
-      "registryType": "ohpm",
-      "dependencies": {
-        "liblrcparser.so": "file:./src/main/cpp/types/liblrcparser"
-      }
-    },
     "@simplepeng/spider-man@1.0.1": {
       "name": "@simplepeng/spider-man",
       "version": "1.0.1",
@@ -186,12 +174,6 @@
       "resolved": "oh_modules/.ohpm/@sj+ffmpeg@1.2.5/oh_modules/@sj/ffmpeg/src/main/cpp/types/libffmpeg",
       "registryType": "local"
     },
-    "liblrcparser.so@oh_modules/.ohpm/@sgaolei+lrc_parser@1.0.0/oh_modules/@sgaolei/lrc_parser/src/main/cpp/types/liblrcparser": {
-      "name": "liblrcparser.so",
-      "version": "1.0.0",
-      "resolved": "oh_modules/.ohpm/@sgaolei+lrc_parser@1.0.0/oh_modules/@sgaolei/lrc_parser/src/main/cpp/types/liblrcparser",
-      "registryType": "local"
-    },
     "pako@2.1.0": {
       "name": "pako",
       "version": "2.1.0",

+ 2 - 3
oh-package.json5

@@ -14,18 +14,17 @@
   "dependencies": {
     "@pura/harmony-utils": "^1.2.4",
     "@pura/harmony-dialog": "^1.0.6",
-    "@ohos/lottie": "^2.0.19",
     "@ohos/pulltorefresh": "^2.1.1",
     "@chinalike/popup": "^0.0.7",
     "@seagazer/cclyric": "file:./lib",
     "@changwei/chardet": "^1.0.0",
     "@cashier_alipay/cashiersdk": "^15.8.32",
     "@keke/color-picker": "^1.0.4",
-    "@sgaolei/lrc_parser": "^1.0.0",
     "@ohos/pinyin4js": "^2.0.2",
     "@simplepeng/spider-man": "^1.0.1",
     "@ohos/juniversalchardet": "^2.0.2",
-    "@sj/ffmpeg": "^1.2.5"
+    "@sj/ffmpeg": "^1.2.5",
+    "@ohos/lottie": "^2.0.23"
   },
   "dynamicDependencies": {}
 }