浏览代码

fix: 长笛教程1-1,节拍播放异常问题修复

TIANYONG 1 年之前
父节点
当前提交
97edc6b3f2
共有 3 个文件被更改,包括 413 次插入412 次删除
  1. 1 2
      osmd-extended/package.json
  2. 27 25
      src/pages/detail/helpers.ts
  3. 385 385
      yarn.lock

+ 1 - 2
osmd-extended/package.json

@@ -14,7 +14,7 @@
     "prebuildVexflow": "ncp src/VexFlowPatch/src/ node_modules/vexflow/src/",
     "prebuildKarma": "ncp src/KarmaWebpackPatch/lib/ node_modules/karma-webpack/lib/",
     "prepare": "npm run build",
-    "build": "npm-run-all lint build:webpack",
+    "build": "npm-run-all build:webpack",
     "build:webpack": "webpack --progress --config webpack.prod.js",
     "build:webpack-dev": "webpack --progress --config webpack.dev.js",
     "build:webpack-sourcemap": "webpack --progress --config webpack.sourcemap.js",
@@ -81,7 +81,6 @@
     "@types/resize-observer-browser": "^0.1.5",
     "@typescript-eslint/eslint-plugin": "^5.5.0",
     "@typescript-eslint/parser": "^5.5.0",
-    "canvas": "^2.8.0",
     "chai": "^4.3.4",
     "clean-webpack-plugin": "^4.0.0",
     "cross-blob": "^3.0.0",

+ 27 - 25
src/pages/detail/helpers.ts

@@ -158,6 +158,7 @@ const tranTime = (str: string = '') => {
   return `1970-01-01 00:${result}0`
 }
 export const getAllNodes = (osmd: any) => {
+  console.log(9999, osmd)
   const detailId = getLinkId()
   let fixtime = browserInfo.huawei ? 0.08 : 0 //getFixTime()
   const allNotes: any[] = []
@@ -635,34 +636,35 @@ export const getAllNodes = (osmd: any) => {
     } catch (error) {}
   }
   // 按照时间轴排序
+  // console.log('看看👀', allNotes)
   const sortArray = allNotes
     .sort((a, b) => a.relativeTime - b.relativeTime)
     .map((item, index) => ({ ...item, i: index }))
-  for (let i = 0; i < sortArray.length; i++) {
-    const note = { ...sortArray[i] }
-    const prevNote = sortArray[i - 1]
-    const isNotNeedStop = note.noteElement.tie && prevNote?.noteElement.tie && note.halfTone === prevNote?.halfTone
-    const isOvertone = false
-    if (prevNote) {
-      if (isNotNeedStop || isOvertone) {
-        note.sourceStartTime = note.time
-        note.sourceRelativeTime = note.relativeTime
-        note.sourceRealValue = note.realValue
-        note.sourceEndTime = note.endtime
-        note.sourceRelaEndtime = note.relaEndtime
-        note.relativeTime = prevNote.relativeTime
-        note.realValue = prevNote.realValue
-        note.time = prevNote.time
-        note.endtime = prevNote.endtime
-        note.relaEndtime = prevNote.relaEndtime
-      }
-      // 此处会导致休止符继续上一个音的指法
-      if (note.halfTone === 0) {
-        note.realKey = prevNote.realKey
-      }
-    }
-    sortArray[i] = note
-  }
+  // for (let i = 0; i < sortArray.length; i++) {
+  //   const note = { ...sortArray[i] }
+  //   const prevNote = sortArray[i - 1]
+  //   const isNotNeedStop = note.noteElement.tie && prevNote?.noteElement.tie && note.halfTone === prevNote?.halfTone
+  //   const isOvertone = false
+  //   if (prevNote) {
+  //     if (isNotNeedStop || isOvertone) {
+  //       note.sourceStartTime = note.time
+  //       note.sourceRelativeTime = note.relativeTime
+  //       note.sourceRealValue = note.realValue
+  //       note.sourceEndTime = note.endtime
+  //       note.sourceRelaEndtime = note.relaEndtime
+  //       note.relativeTime = prevNote.relativeTime
+  //       note.realValue = prevNote.realValue
+  //       note.time = prevNote.time
+  //       note.endtime = prevNote.endtime
+  //       note.relaEndtime = prevNote.relaEndtime
+  //     }
+  //     // 此处会导致休止符继续上一个音的指法
+  //     if (note.halfTone === 0) {
+  //       note.realKey = prevNote.realKey
+  //     }
+  //   }
+  //   sortArray[i] = note
+  // }
   // console.log(sortArray)
   return sortArray
 }

文件差异内容过多而无法显示
+ 385 - 385
yarn.lock


部分文件因为文件数量过多而无法显示