Skip to content

Commit 09b0705

Browse files
yibeichanyibeichan
committed
refactor: consolidate audio/video components
1 parent c783a79 commit 09b0705

File tree

15 files changed

+346
-1789
lines changed

15 files changed

+346
-1789
lines changed

‎src/components/InputSelector/InputSelector.vue‎

Lines changed: 39 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -23,157 +23,57 @@
2323
</div>
2424

2525
<div v-else-if="inputType === 'audioCheck'">
26-
<AudioCheck
26+
<MediaRecord
2727
:constraints="valueConstraints"
2828
:selected_language="selected_language"
29-
:init="init" v-on:valueChanged="sendData"/>
29+
:init="init"
30+
:audio="true"
31+
:visualizer="true"
32+
v-on:valueChanged="sendData"/>
3033
</div>
3134

32-
<!-- If type is audioRecord -->
33-
<div v-else-if="inputType === 'audioRecord'">
34-
<AudioRecord
35-
:constraints="valueConstraints"
36-
:selected_language="selected_language"
37-
:init="init" v-on:valueChanged="sendData"/>
38-
</div>
39-
40-
<div v-else-if="inputType === 'audioPassageRecord'">
41-
<AudioRecord
42-
:constraints="valueConstraints"
43-
:selected_language="selected_language"
44-
:init="init" v-on:valueChanged="sendData"/>
45-
</div>
46-
47-
<!-- If type is audioImageRecord -->
48-
<div v-else-if="inputType === 'audioImageRecord'">
49-
<AudioRecord
50-
:constraints="valueConstraints"
51-
:fieldData="fieldData"
52-
:selected_language="selected_language"
53-
:init="init" v-on:valueChanged="sendData"
54-
mode="audioImageRecord" />
55-
</div>
56-
57-
<!-- If type is audioRecordNumberTask -->
58-
<div v-else-if="inputType === 'audioRecordNumberTask'">
59-
<AudioRecord
60-
:constraints="valueConstraints"
61-
:selected_language="selected_language"
62-
:init="init" v-on:valueChanged="sendData"
63-
mode="audioRecordNumberTask" />
64-
</div>
65-
66-
<!-- If type is audioRecordAudioTask -->
67-
<div v-else-if="inputType === 'audioRecordAudioTask'">
68-
<AudioRecord
69-
:constraints="valueConstraints"
70-
:selected_language="selected_language"
71-
:init="init" v-on:valueChanged="sendData"
72-
:fieldData="fieldData"
73-
mode="audioRecordAudioTask" />
74-
</div>
75-
76-
<!-- If type is audioRecordNoStop -->
77-
<div v-else-if="inputType === 'audioRecordNoStop'">
78-
<AudioRecord
35+
<div v-else-if="inputType === 'videoCheck'">
36+
<MediaRecord
7937
:constraints="valueConstraints"
8038
:selected_language="selected_language"
81-
:init="init" v-on:valueChanged="sendData"
82-
mode="audioRecordNoStop" />
39+
:init="init"
40+
:audio="false"
41+
:visualizer="false"
42+
v-on:valueChanged="sendData"/>
8343
</div>
8444

8545
<div v-else-if="inputType === 'audioVideoCheck'">
86-
<AudioVideoCheck
87-
:constraints="valueConstraints"
88-
:selected_language="selected_language"
89-
:init="init" v-on:valueChanged="sendData"/>
90-
</div>
91-
92-
<!-- If type is audioVideoRecord -->
93-
<div v-else-if="inputType === 'audioVideoRecord'">
94-
<AudioVideoRecord
95-
:constraints="valueConstraints"
96-
:selected_language="selected_language"
97-
:init="init" v-on:valueChanged="sendData"/>
98-
</div>
99-
100-
<div v-else-if="inputType === 'audioVideoPassageRecord'">
101-
<AudioVideoRecord
46+
<MediaRecord
10247
:constraints="valueConstraints"
10348
:selected_language="selected_language"
104-
:init="init" v-on:valueChanged="sendData"/>
105-
</div>
106-
107-
<!-- If type is audioVideoImageRecord -->
108-
<div v-else-if="inputType === 'audioVideoImageRecord'">
109-
<AudioVideoRecord
110-
:constraints="valueConstraints"
111-
:fieldData="fieldData"
112-
:selected_language="selected_language"
113-
:init="init" v-on:valueChanged="sendData"
114-
mode="audioVideoImageRecord" />
49+
:init="init"
50+
:audio="true"
51+
:visualizer="true"
52+
v-on:valueChanged="sendData"/>
11553
</div>
11654

117-
<!-- If type is audioRecordNumberTask -->
118-
<div v-else-if="inputType === 'audioVideoRecordNumberTask'">
119-
<AudioVideoRecord
55+
<div v-else-if="inputType.startsWith('audio')">
56+
<MediaRecord
12057
:constraints="valueConstraints"
12158
:selected_language="selected_language"
122-
:init="init" v-on:valueChanged="sendData"
123-
mode="audioVideoRecordNumberTask" />
124-
</div>
125-
126-
<!-- If type is audioRecordAudioTask -->
127-
<div v-else-if="inputType === 'audioVideoRecordAudioTask'">
128-
<AudioVideoRecord
129-
:constraints="valueConstraints"
130-
:selected_language="selected_language"
131-
:init="init" v-on:valueChanged="sendData"
59+
:init="init"
60+
:audio="true"
61+
:visualizer="true"
62+
:mode="inputType"
13263
:fieldData="fieldData"
133-
mode="audioVideoRecordAudioTask" />
64+
v-on:valueChanged="sendData"/>
13465
</div>
13566

136-
<!-- If type is audioVideoRecordNoStop -->
137-
<div v-else-if="inputType === 'audioVideoRecordNoStop'">
138-
<AudioVideoRecord
67+
<div v-else-if="inputType.startsWith('video')">
68+
<MediaRecord
13969
:constraints="valueConstraints"
14070
:selected_language="selected_language"
141-
:init="init" v-on:valueChanged="sendData"
142-
mode="audioVideoRecordNoStop" />
143-
</div>
144-
145-
<div v-else-if="inputType === 'videoCheck'">
146-
<VideoCheck
147-
:constraints="valueConstraints"
148-
:selected_language="selected_language"
149-
:init="init" v-on:valueChanged="sendData"/>
150-
</div>
151-
152-
<!-- If type is VideoRecord -->
153-
<div v-else-if="inputType === 'videoRecord'">
154-
<VideoRecord
155-
:constraints="valueConstraints"
156-
:selected_language="selected_language"
157-
:init="init" v-on:valueChanged="sendData"/>
158-
</div>
159-
160-
<!-- If type is videoRecordVideoTask -->
161-
<div v-else-if="inputType === 'videoRecordVideoTask'">
162-
<VideoRecord
163-
:constraints="valueConstraints"
164-
:selected_language="selected_language"
165-
:init="init" v-on:valueChanged="sendData"
71+
:init="init"
72+
:audio="false"
73+
:visualizer="false"
74+
:mode="inputType"
16675
:fieldData="fieldData"
167-
mode="videoRecordVideoTask" />
168-
</div>
169-
170-
<!-- If type is videoRecordNoStop -->
171-
<div v-else-if="inputType === 'videoRecordNoStop'">
172-
<VideoRecord
173-
:constraints="valueConstraints"
174-
:selected_language="selected_language"
175-
:init="init" v-on:valueChanged="sendData"
176-
mode="videoRecordNoStop" />
76+
v-on:valueChanged="sendData"/>
17777
</div>
17878

17979
<!-- If type is text -->
@@ -341,24 +241,19 @@
341241

342242
<script>
343243
import Radio from '../Inputs/WebRadio/';
344-
import AudioRecord from '../Inputs/WebAudioRecord/';
345-
import AudioVideoRecord from '../Inputs/WebAudioVideoRecord/';
346-
import VideoRecord from '../Inputs/WebVideoRecord/';
244+
import MediaRecord from '../Inputs/MediaRecord/';
347245
import TextInput from '../Inputs/WebTextInput/';
348246
import TextArea from '../Inputs/TextArea/';
349247
import IntegerInput from '../Inputs/WebIntegerInput/';
350248
import FloatInput from '../Inputs/WebFloatInput/';
351249
import RangeInput from '../Inputs/RangeInput/';
352250
import DateInput from '../Inputs/YearInput/';
353-
import DocumentUpload from '../Inputs/DocumentUpload';
354-
import MultiTextInput from '../Inputs/MultiTextInput';
355-
import SliderInput from '../Inputs/SliderInput';
356-
import TimeRange from '../Inputs/TimeRange';
357-
import SelectInput from '../Inputs/SelectInput';
358-
import AudioCheck from '../Inputs/AudioCheck/';
359-
import VideoCheck from '../Inputs/VideoCheck/';
360-
import AudioVideoCheck from '../Inputs/AudioVideoCheck/';
361-
import StaticReadOnly from '../Inputs/StaticReadOnly';
251+
import DocumentUpload from '../Inputs/DocumentUpload/';
252+
import MultiTextInput from '../Inputs/MultiTextInput/';
253+
import SliderInput from '../Inputs/SliderInput/';
254+
import TimeRange from '../Inputs/TimeRange/';
255+
import SelectInput from '../Inputs/SelectInput/';
256+
import StaticReadOnly from '../Inputs/StaticReadOnly/';
362257
import SaveData from '../Inputs/SaveData/SaveData';
363258
import StudySign from '../StudySign/StudySign';
364259
// import Static from '../Inputs/Static';
@@ -411,12 +306,7 @@ export default {
411306
StudySign,
412307
SaveData,
413308
Radio,
414-
AudioRecord,
415-
AudioVideoRecord,
416-
VideoRecord,
417-
AudioCheck,
418-
VideoCheck,
419-
AudioVideoCheck,
309+
MediaRecord,
420310
TextInput,
421311
TextArea,
422312
EmailInput,
@@ -474,3 +364,4 @@ export default {
474364
}
475365
476366
</style>
367+

0 commit comments

Comments
 (0)