skyblued 2 лет назад
Родитель
Сommit
fd2e7f2a6c

+ 2 - 2
src/pages/detail/helpers.ts

@@ -621,8 +621,8 @@ export const getAllNodes = (osmd: any) => {
           }
         }
       }
-      // iterator.moveToNextVisibleVoiceEntry(false)
-      osmd.cursor.next()
+      iterator.moveToNextVisibleVoiceEntry(false)
+      // osmd.cursor.next()
       i++
     }
     try {

+ 0 - 2
src/subpages/colexiu/index.tsx

@@ -176,8 +176,6 @@ export default defineComponent({
       detailState.baseSpeed = detail.value.playSpeed || bpm || 100
       detailState.code = detail.value?.code || ''
       detailState.activeDetail.originalSpeed = detailState.baseSpeed
-      // 设置成全部是特殊曲谱
-      detailState.isSpecialBookCategory = true
       if (detailState.renderType === 'native') {
         detailState.times = getAllNodes(osmd)
       }

+ 8 - 1
src/subpages/colexiu/uses/use-app.ts

@@ -18,7 +18,11 @@ import { getGradualLengthByXml } from '/src/pages/detail/calcSpeed'
 
 const search = useOriginSearch()
 const skpList = ['Ukulele']
-
+/**
+ * 特殊教材分类id
+ */
+export const classids = [1, 2, 6, 7, 8, 9, 3, 10, 11, 12, 13, 4, 14, 15, 16, 17, 30, 31, 35, 36, 108];  // 大雅金唐, 竖笛教程, 声部训练展开的分类ID
+// export const classids = [1, 30, 97]; // [大雅金唐, 竖笛教程, 声部训练]
 /**
  * 获取xml并前置格式化
  * @param url xml地址
@@ -160,6 +164,9 @@ export const useDetail = (id: number | string): [Ref<ShaeetStatusType>, Ref<Musi
       if (data.value.notation == 0) {
         SettingState.sett.type = 'staff'
       }
+      // 设置是否特殊曲谱, 是特殊曲谱取反(不理解之前的思考逻辑), 使用后台设置的速度
+      detailState.isSpecialBookCategory = !classids.includes(res.data.musicSheetCategoriesId) 
+      // console.log("🚀 ~ detailState.isSpecialBookCategory:", detailState.isSpecialBookCategory, res.data.musicSheetCategoriesId)
       detailState.subjectId = (res.data.musicSubject || '').split(',')[0] || 0
       ;(window as any).DYSubjectId = formatId(data.value.code as any)
       status.value = 'success'