Merge branch 'main' of http://124.243.245.42:3000/sdz/live-stream-app
This commit is contained in:
@@ -34,7 +34,7 @@ function createWindow(): void {
|
||||
mainWindow.show();
|
||||
});
|
||||
|
||||
// mainWindow.webContents.openDevTools();
|
||||
mainWindow.webContents.openDevTools();
|
||||
|
||||
mainWindow.webContents.setWindowOpenHandler((details) => {
|
||||
shell.openExternal(details.url);
|
||||
|
||||
@@ -40,7 +40,7 @@ export function setupLiveHandlers() {
|
||||
hasLiveWindow: !!liveState.liveWindow,
|
||||
isVideoInserted: liveState.isVideoInserted,
|
||||
cameraActive: liveState.cameraActive,
|
||||
sessionId: liveState.sessionId
|
||||
sessionId: liveState.sessionId,
|
||||
},
|
||||
};
|
||||
});
|
||||
@@ -107,7 +107,6 @@ export function setupLiveHandlers() {
|
||||
|
||||
// socket
|
||||
|
||||
|
||||
// 5. 设置直播状态
|
||||
liveState.isLiveOn = true;
|
||||
|
||||
@@ -241,7 +240,7 @@ export function setupLiveHandlers() {
|
||||
allowRunningInsecureContent: true, // 允许运行本地内容
|
||||
},
|
||||
});
|
||||
// liveState.liveWindow.webContents.openDevTools();
|
||||
liveState.liveWindow.webContents.openDevTools();
|
||||
liveState.liveWindow.on("closed", () => {
|
||||
liveState.liveWindow = null;
|
||||
liveState.isLiveOn = false;
|
||||
|
||||
Reference in New Issue
Block a user