Commit bada2856 authored by 范雪寒's avatar 范雪寒

fix: 整体音频与题目音频没有分清

parent a4b75e80
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<br> <br>
<span style="float: left; height: 30px; font-size: 18px;">题目音频:</span> <span style="float: left; height: 30px; font-size: 18px;">题目音频:</span>
<app-audio-recorder <app-audio-recorder
[audioUrl]="item.audio" [audioUrl]="item.tittleAudio"
(audioUploaded)="onWholeQuestionAudioUploadSuccess($event, 'audio_url')" (audioUploaded)="onWholeQuestionAudioUploadSuccess($event, 'audio_url')"
></app-audio-recorder> ></app-audio-recorder>
<br> <br>
......
...@@ -264,9 +264,9 @@ export class MyGame extends Game { ...@@ -264,9 +264,9 @@ export class MyGame extends Game {
question.words.match(/(([a-z]|[A-Z]|[0-9]|'|-|&|_)+|.)/g).forEach((word, wordIdx) => { question.words.match(/(([a-z]|[A-Z]|[0-9]|'|-|&|_)+|.)/g).forEach((word, wordIdx) => {
let block = question.blocks.find(block => block.idx == wordIdx); let block = question.blocks.find(block => block.idx == wordIdx);
let posX = labelList.reduce((offsetX, label) => offsetX + label.width * label.scaleX, 0); let posX = labelList.reduce((offsetX, label) => label.width == 0 ? offsetX : offsetX + label.width * label.scaleX, 0);
console.log('posX = ' + posX); // console.log('posX = ' + posX);
let questionLabel = new MyLabel(); let questionLabel = new MyLabel();
questionLabel.fontSize = 42; questionLabel.fontSize = 42;
...@@ -318,7 +318,7 @@ export class MyGame extends Game { ...@@ -318,7 +318,7 @@ export class MyGame extends Game {
} }
if (question.audio != '') { if (question.audio != '') {
let offsetX = labelList.reduce((offsetX, label) => { return offsetX + label.width * label.scaleX }, 0); let offsetX = labelList.reduce((offsetX, label) => label.width == 0 ? offsetX : offsetX + label.width * label.scaleX, 0);
this._createSpeacker( this._createSpeacker(
this.images.get('Btn_s_play'), this.images.get('Btn_s_play'),
this.images.get('Btn_s_pause'), this.images.get('Btn_s_pause'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment