marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

Merge pull request 'yj' (#4) from yj into master 

Reviewed-on: #4
This commit is contained in:
yj 2024-09-22 13:44:28 +08:00
parent 1c92406b1c bad452a34b
commit 29af7451cc
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/page/Home/User/index.tsx
View File

@ -476,8 +476,6 @@ const User: React.FC = () => {
file.onchange = async () => { file.onchange = async () => {
const setting = await JSON.parse(storage.getItem('setting') as string) const setting = await JSON.parse(storage.getItem('setting') as string)
const fileInfo = file.files[0]; const fileInfo = file.files[0];
console.log(fileInfo);
return
const formData = new FormData(); const formData = new FormData();
formData.append("file", fileInfo); formData.append("file", fileInfo);
await PostUserImport(formData).then(res => { await PostUserImport(formData).then(res => {

2
src/page/Meeting/index.tsx
View File

@ -1053,6 +1053,7 @@ const Meeting: React.FC = () => {
// 录制所有音频输入设备 // 录制所有音频输入设备
audioInputDevices.forEach(async device => { audioInputDevices.forEach(async device => {
const micStream = await navigator.mediaDevices.getUserMedia({ audio: { deviceId: { exact: device.deviceId } } }); const micStream = await navigator.mediaDevices.getUserMedia({ audio: { deviceId: { exact: device.deviceId } } });
setMediaStream(micStream);
const micSoundSource = audioCtx.createMediaStreamSource(micStream); const micSoundSource = audioCtx.createMediaStreamSource(micStream);
micSoundSource.connect(systemSoundDestination); micSoundSource.connect(systemSoundDestination);
}) })
@ -1063,7 +1064,6 @@ const Meeting: React.FC = () => {
mimeType: 'video/webm;codecs=vp9,opus', mimeType: 'video/webm;codecs=vp9,opus',
videoBitsPerSecond: 1.5e6, videoBitsPerSecond: 1.5e6,
}); });
setMediaStream(combinedSource);
setRecorder(mediaRecorder); setRecorder(mediaRecorder);
}); });
} catch (error: any) { } catch (error: any) {