Merge branch 'feature-tianyong'

src/helpers/formateMusic.ts

@@ -356,7 +356,7 @@ export const onlyVisible = (xml: string, partIndex: number): string => {
 	const detailId = state.examSongId + "";
 	const xmlParse = new DOMParser().parseFromString(xml, "text/xml");
 	const partList = xmlParse.getElementsByTagName("part-list")?.[0]?.getElementsByTagName("score-part") || [];
-	const partListNames = Array.from(partList).map((item) => item.getElementsByTagName("part-name")?.[0].textContent || "");
+	const partListNames = Array.from(partList).map((item) => item.getElementsByTagName("part-name")?.[0]?.textContent || "");
 	const parts: any = xmlParse.getElementsByTagName("part");
 	// const firstTimeInfo = parts[0]?.getElementsByTagName('metronome')[0]?.parentElement?.parentElement?.cloneNode(true)
 	const firstMeasures = [...parts[0]?.getElementsByTagName("measure")];
@@ -825,7 +825,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 			if (i === 0) {
 				fixtime += getFixTime(beatSpeed);
 				state.fixtime = fixtime;
-				console.log("fixtime:", fixtime, '速度:', beatSpeed, "state.isSpecialBookCategory:", state.isSpecialBookCategory, 'state.isOpenMetronome:', state.isOpenMetronome);
+				// console.log("fixtime:", fixtime, '速度:', beatSpeed, "state.isSpecialBookCategory:", state.isSpecialBookCategory, 'state.isOpenMetronome:', state.isOpenMetronome);
 			}
 			// console.log(getTimeByBeatUnit(beatUnit, measureSpeed, iterator.currentMeasure.activeTimeSignature.Denominator))
 			let gradualLength = 0;
@@ -949,6 +949,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 			}
 
 			// console.log(note.tie)
+			// console.log(relaEndtime, fixtime, '时间')
 			const nodeDetail = {
 				isStaccato: note.voiceEntry.isStaccato(),
 				isRestFlag: note.isRestFlag,

src/page-instrument/header-top/settting/index.tsx

@@ -183,11 +183,11 @@ export default defineComponent({
 									),
 								}}
 							</Cell>
-							<Cell title="保存到相册" center>
+							{/* <Cell title="保存到相册" center>
 								{{
 									extra: () => <Switch v-model={state.setting.saveToAlbum}></Switch>,
 								}}
-							</Cell>
+							</Cell> */}
 							<Cell title="开启伴奏" center>
 								{{
 									extra: () => <Switch v-model={state.setting.enableAccompaniment}></Switch>,

src/page-instrument/view-detail/index.module.less

@@ -45,8 +45,9 @@
     #cursorImg-0 {
         width: 2PX !important;
         min-height: 58PX;
+        height: 58PX;
         content: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-        margin-top: -14PX;
+        margin-top: -13PX;
         border-radius: 4Px;
         background-color: rgba(25, 140, 254, 0.7);
         opacity: var(--corsor-opacity);

src/page-instrument/view-detail/index.tsx

@@ -28,6 +28,11 @@ import ViewFigner from "../view-figner";
 import { recalculateNoteData } from "/src/view/selection";
 import ToggleMusicSheet from "/src/view/plugins/toggleMusicSheet"
 
+/**
+ * 特殊教材分类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
+
 const calcCeilFrequency = (frequency: number) => {
   if (frequency) return frequency * 1000 * 2 / 1000;
   return 0
@@ -163,6 +168,9 @@ export default defineComponent({
       // 	state.subjectId == 121 ||
       // 	isRhythmicExercises();
 
+      // 设置是否特殊曲谱, 是特殊曲谱取反(不理解之前的思考逻辑), 使用后台设置的速度
+      state.isSpecialBookCategory = !classids.includes(data.musicSheetCategoriesId) 
+
       // 设置指法
       const code = mappingVoicePart(state.trackId, "INSTRUMENT");
       state.fingeringInfo = subjectFingering(code);

src/state.ts

@@ -143,7 +143,7 @@ const state = reactive({
     /** 评测难度 */
     evaluationDifficulty: "ADVANCED" as IDifficulty,
     /** 保存到相册 */
-    saveToAlbum: false,
+    saveToAlbum: true,
     /** 开启伴奏 */
     enableAccompaniment: true,
     /** 反应时间 */

src/view/selection/index.module.less

@@ -93,12 +93,14 @@
     height: 120%;
     background-color: rgba(25, 140, 254, 0.7);
     min-height: 58PX;
+    height: 58PX;
+    top: 50%;
     // width: 14PX;
     width: 2PX !important;
-    margin-top: -17PX;
+    // margin-top: -17PX;
     border-radius: 4Px;
-    opacity: var(--corsor-opacity);   
-    transform: translateX(4Px);
+    opacity: var(--corsor-opacity);
+    transform: translate(4PX, -50%);
 }
 
 .lineStaff {