diff --git a/plugin/Live/webRTC.css b/plugin/Live/webRTC.css index 05015de86..054bec590 100644 --- a/plugin/Live/webRTC.css +++ b/plugin/Live/webRTC.css @@ -1,22 +1,24 @@ -#webRTCDisconnect, #webRTCPleaseWait{ +#webRTCDisconnect, #webRTCPleaseWait, #liveControls{ display: none; } body.webRTCPleaseWait #webRTCDisconnect, body.webRTCPleaseWait #webRTCConnect { display: none; } body.webRTCPleaseWait #webRTCPleaseWait { display: block; } body.webRTCisLive #webRTCPleaseWait, -body.webRTCisLive #webRTCConnect { +body.webRTCisLive #webRTCConnect{ display: none; } -body.webRTCisLive #webRTCDisconnect { +body.webRTCisLive #webRTCDisconnect, +body.webRTCisLive #liveControls { display: block; -} \ No newline at end of file +} + diff --git a/plugin/Live/webRTC.js b/plugin/Live/webRTC.js index c1a772b9e..c474c3b2f 100644 --- a/plugin/Live/webRTC.js +++ b/plugin/Live/webRTC.js @@ -1,85 +1,85 @@ window.addEventListener('message', event => { if (event.data.startLiveRestream) { startLiveRestream(event.data.m3u8, forceIndex); }else if (event.data.showPleaseWait) { modal.showPleaseWait(); }else if (event.data.hidePleaseWait) { modal.hidePleaseWait(); }else if (event.data.webRTCModalConfig) { console.log('event.data.webRTCModalConfig', event.data.webRTCModalConfig, typeof webRTCModalConfigShow); if(event.data.webRTCModalConfig==1){ if(typeof webRTCModalConfigShow =='function'){ webRTCModalConfigShow(); } }else{ if(typeof webRTCModalConfigHide =='function'){ webRTCModalConfigHide(); } } } }); function startLiveRestream(m3u8, forceIndex) { console.log('WebRTCLiveCam: startLiveRestream', m3u8, forceIndex); modal.showPleaseWait(); $.ajax({ url: webSiteRootURL + '/plugin/Live/webRTCToLive.json.php', method: 'POST', data: { 'm3u8': m3u8, 'live_servers_id': live_servers_id, 'forceIndex': forceIndex }, success: function (response) { if (response.error) { webRTCDisconnect(); avideoAlertError(response.msg); } else { avideoToastSuccess(response.msg); //document.querySelector("iframe").contentWindow.postMessage({setLiveStart: 1}, "*"); } modal.hidePleaseWait(); } }); } function webRTCConnect() { modal.showPleaseWait(); document.querySelector("iframe").contentWindow.postMessage({setLiveStart: 1}, "*"); webRTCPleaseWaitShow(); } function webRTCDisconnect() { document.querySelector("iframe").contentWindow.postMessage({setLiveStop: 1}, "*"); webRTCPleaseWaitHide(); } function webRTCConfiguration() { document.querySelector("iframe").contentWindow.postMessage({setConfiguration: 1}, "*"); } var _webRTCPleaseWaitShowTimeout; function webRTCPleaseWaitShow(){ $('body').addClass('webRTCPleaseWait'); clearTimeout(_webRTCPleaseWaitShowTimeout); _webRTCPleaseWaitShowTimeout = setTimeout(function(){ webRTCPleaseWaitHide(); - },10000); + },60000); } function webRTCPleaseWaitHide(){ clearTimeout(_webRTCPleaseWaitShowTimeout); $('body').removeClass('webRTCPleaseWait'); } function webRTCisLive(){ $('body').addClass('webRTCisLive'); webRTCPleaseWaitHide(); } function webRTCisOffline(){ $('body').removeClass('webRTCisLive'); webRTCPleaseWaitHide(); } \ No newline at end of file