BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #725 from pedrobmarin/pedrobmarin-development-auto-reconnect

Browse Source 
loading bar and webrtc phone button
This commit is contained in:
Richard Alam 2015-07-27 16:23:57 -04:00
commit 6775aa0ec6
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
View File

@ -24,6 +24,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mate:Listener type="{ModuleLoadEvent.MODULE_LOADING_STARTED}" method="moduleLoadingStarted" /> <mate:Listener type="{ModuleLoadEvent.MODULE_LOADING_STARTED}" method="moduleLoadingStarted" />
<mate:Listener type="{ModuleLoadEvent.MODULE_LOAD_PROGRESS}" method="moduleLoadProgress" /> <mate:Listener type="{ModuleLoadEvent.MODULE_LOAD_PROGRESS}" method="moduleLoadProgress" />
<mate:Listener type="{ModuleLoadEvent.ALL_MODULES_LOADED}" method="allModulesLoaded" />
<mate:Listener type="{PortTestEvent.TEST_RTMP}" method="testRTMP" /> <mate:Listener type="{PortTestEvent.TEST_RTMP}" method="testRTMP" />
<mate:Listener type="{PortTestEvent.PORT_TEST_UPDATE}" method="testRTMPupdate" /> <mate:Listener type="{PortTestEvent.PORT_TEST_UPDATE}" method="testRTMPupdate" />
<mate:Listener type="{PortTestEvent.TUNNELING_FAILED}" method="tunnelingFailed" /> <mate:Listener type="{PortTestEvent.TUNNELING_FAILED}" method="tunnelingFailed" />
@ -71,6 +72,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
this.setProgress(totalProgress/numModules, 100); this.setProgress(totalProgress/numModules, 100);
} }
private function allModulesLoaded(e:ModuleLoadEvent):void{
if (parent != null) parent.removeChild(this);
}
private function testRTMP(e:PortTestEvent):void{ private function testRTMP(e:PortTestEvent):void{
//- Cannot get locale string this early in loading process //- Cannot get locale string this early in loading process
portUpdateStr += "." portUpdateStr += "."

7
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
View File

@ -419,5 +419,12 @@
usingFlash = true; usingFlash = true;
startCall(true); startCall(true);
} }
public function handleFlashLeftVoiceConference():void {
if (isConnected()) {
streamManager.stopStreams();
connectionManager.disconnect(true);
}
}
} }
} }

5
bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
View File

@ -33,6 +33,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.modules.phone.events.FlashCallDisconnectedEvent; import org.bigbluebutton.modules.phone.events.FlashCallDisconnectedEvent;
import org.bigbluebutton.modules.phone.events.FlashEchoTestHasAudioEvent; import org.bigbluebutton.modules.phone.events.FlashEchoTestHasAudioEvent;
import org.bigbluebutton.modules.phone.events.FlashEchoTestNoAudioEvent; import org.bigbluebutton.modules.phone.events.FlashEchoTestNoAudioEvent;
import org.bigbluebutton.modules.phone.events.FlashLeftVoiceConferenceEvent;
import org.bigbluebutton.modules.phone.events.FlashStartEchoTestCommand; import org.bigbluebutton.modules.phone.events.FlashStartEchoTestCommand;
import org.bigbluebutton.modules.phone.events.FlashStopEchoTestCommand; import org.bigbluebutton.modules.phone.events.FlashStopEchoTestCommand;
import org.bigbluebutton.modules.phone.events.FlashVoiceConnectionStatusEvent; import org.bigbluebutton.modules.phone.events.FlashVoiceConnectionStatusEvent;
@ -107,6 +108,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<MethodInvoker generator="{FlashCallManager}" method="handleLeaveVoiceConferenceCommand" arguments="{event}"/> <MethodInvoker generator="{FlashCallManager}" method="handleLeaveVoiceConferenceCommand" arguments="{event}"/>
</EventHandlers> </EventHandlers>
<EventHandlers type="{FlashLeftVoiceConferenceEvent.LEFT_VOICE_CONFERENCE}">
<MethodInvoker generator="{FlashCallManager}" method="handleFlashLeftVoiceConference"/>
</EventHandlers>
<EventHandlers type="{UseFlashModeCommand.USE_FLASH_MODE}"> <EventHandlers type="{UseFlashModeCommand.USE_FLASH_MODE}">
<MethodInvoker generator="{FlashCallManager}" method="handleUseFlashModeCommand"/> <MethodInvoker generator="{FlashCallManager}" method="handleUseFlashModeCommand"/>
</EventHandlers> </EventHandlers>