|
@@ -233,6 +233,7 @@ const delayData = reactive({
|
|
|
runtime.delayCheckFirst = true
|
|
|
delayData.open = false
|
|
|
delayData.checkStatus = 'init'
|
|
|
+ delayData.step = 1
|
|
|
handleToggleTune('stop')
|
|
|
// this.close();
|
|
|
}
|
|
@@ -246,7 +247,9 @@ const delayData = reactive({
|
|
|
return;
|
|
|
}
|
|
|
delayData.checkStatus = 'ing';
|
|
|
- startTune();
|
|
|
+ setTimeout(() => {
|
|
|
+ startTune()
|
|
|
+ }, 2000)
|
|
|
checkWiredStatus();
|
|
|
}
|
|
|
|
|
@@ -379,6 +382,7 @@ const formatTimes = () => {
|
|
|
denominator: note.noteElement?.Length.denominator,
|
|
|
isOrnament: !!note?.voiceEntry?.ornamentContainer,
|
|
|
}
|
|
|
+ // console.log('时间1111', data)
|
|
|
datas.push(data)
|
|
|
}
|
|
|
return datas
|
|
@@ -485,11 +489,11 @@ export const evaluatStopPlay = stopPlay
|
|
|
|
|
|
const startPlay = () => {
|
|
|
console.log('连接服务成功,开始播放', new Date().getTime() - runtime.clickTime)
|
|
|
- if (!SettingState.eva.mute) {
|
|
|
- RuntimeUtils.changeAllMode()
|
|
|
- } else {
|
|
|
- RuntimeUtils.changeMode('background')
|
|
|
- }
|
|
|
+ // if (!SettingState.eva.mute) {
|
|
|
+ // RuntimeUtils.changeAllMode()
|
|
|
+ // } else {
|
|
|
+ // RuntimeUtils.changeMode('background')
|
|
|
+ // }
|
|
|
startButtonShow.value = false
|
|
|
RuntimeUtils.setPlayState()
|
|
|
}
|
|
@@ -640,6 +644,9 @@ const evaluatStart = () => {
|
|
|
postMessage(
|
|
|
{
|
|
|
api: 'startRecording',
|
|
|
+ content: {
|
|
|
+ accompanimentState: SettingState.eva.mute ? 1 : 0
|
|
|
+ }
|
|
|
},
|
|
|
() => {
|
|
|
// console.log('开始录音app回调时间', Date.now())
|
|
@@ -817,22 +824,44 @@ export const submitMaxScore = () => {
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
+/**
|
|
|
+ * 木管(长笛 萨克斯 单簧管)乐器一级的2、3、6测评要放原音音频
|
|
|
+ * 铜管乐器一级的1a,1b,5,6测评要放原音音频
|
|
|
+ */
|
|
|
+const getMusicMode = (): RuntimeUtils.IMode => {
|
|
|
+ const muguan = [2, 4, 5, 6];
|
|
|
+ const tongguan = [12, 13, 14, 15, 17];
|
|
|
+ if (muguan.includes(detailState.subjectId) && (detailState.activeDetail?.examSongName || "").search(/[^\u0000-\u00FF](1-2|1-3|1-6)/gi) > -1) {
|
|
|
+ return "music";
|
|
|
+ }
|
|
|
+ if (tongguan.includes(detailState.subjectId) && (detailState.activeDetail?.examSongName || "").search(/[^\u0000-\u00FF](1-1-1|1-1-2|1-5|1-6)/gi) > -1) {
|
|
|
+ return "music";
|
|
|
+ }
|
|
|
+ if ([23, 113, 121].includes(detailState.subjectId)) {
|
|
|
+ return "music";
|
|
|
+ }
|
|
|
+ return "background";
|
|
|
+};
|
|
|
|
|
|
export default defineComponent({
|
|
|
name: 'ColexiuButtonEvaluating',
|
|
|
setup(props, { expose }) {
|
|
|
onMounted(async () => {
|
|
|
console.log('进入评测模块')
|
|
|
+ if (!SettingState.eva.mute) {
|
|
|
+ RuntimeUtils.changeAllMode();
|
|
|
+ } else {
|
|
|
+ RuntimeUtils.changeMode('background', 'all')
|
|
|
+ }
|
|
|
handleCheckEvaluatStatus()
|
|
|
// 如果为单元测验和课后训练,不清楚选段数据
|
|
|
if (!unitTestData.isSelectMeasureMode) {
|
|
|
detailState.section = []
|
|
|
detailState.sectionStatus = false
|
|
|
}
|
|
|
- RuntimeUtils.changeAllMode()
|
|
|
playUrl.value = runtime.songs.background || (runtime.songs.music as string)
|
|
|
- runtime.audiosInstance?.audios[playUrl.value]?.addEventListener('play', timeupdate)
|
|
|
- runtime.audiosInstance?.audios[playUrl.value]?.addEventListener('timeupdate', onProgress)
|
|
|
+ // runtime.audiosInstance?.audios[playUrl.value]?.addEventListener('play', timeupdate)
|
|
|
+ // runtime.audiosInstance?.audios[playUrl.value]?.addEventListener('timeupdate', onProgress)
|
|
|
// RuntimeUtils.event.on('next-click', playerStop)
|
|
|
RuntimeUtils.event.on('ended', endevent)
|
|
|
listenerMessage('sendResult', sendResult)
|
|
@@ -846,8 +875,8 @@ export default defineComponent({
|
|
|
})
|
|
|
|
|
|
onBeforeUnmount(() => {
|
|
|
- runtime.audiosInstance?.audios[playUrl.value]?.removeEventListener('play', timeupdate)
|
|
|
- runtime.audiosInstance?.audios[playUrl.value]?.removeEventListener('timeupdate', onProgress)
|
|
|
+ // runtime.audiosInstance?.audios[playUrl.value]?.removeEventListener('play', timeupdate)
|
|
|
+ // runtime.audiosInstance?.audios[playUrl.value]?.removeEventListener('timeupdate', onProgress)
|
|
|
// RuntimeUtils.event.off('next-click', playerStop)
|
|
|
RuntimeUtils.event.off('ended', endevent)
|
|
|
RuntimeUtils.event.off('tickDestroy', cloudMetronome)
|