Merge remote-tracking branch 'origin/video-streaming-android' into video-streaming-android

merge-requests/745/head
Mohammad Aljammal 5 years ago
commit f9a989b6fd

@ -365,12 +365,15 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
cmTimer.base = SystemClock.elapsedRealtime()
}
cmTimer.start()
videoCallResponseListener?.minimizeVideoEvent(true)
}
override fun onDisconnected(session: Session) {
Log.d(TAG, "onDisconnected: disconnected from session " + session.sessionId)
mSession = null
cmTimer.stop()
disconnectSession()
videoCallResponseListener?.minimizeVideoEvent(false)
}
override fun onError(session: Session, opentokError: OpentokError) {
@ -477,11 +480,6 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
mSession!!.subscribe(mSubscriber)
}
override fun dismiss() {
videoCallResponseListener?.onCallFinished(1000)
super.dismiss()
}
private fun disconnectSession() {
if (mSession == null) {
videoCallResponseListener?.onCallFinished(Activity.RESULT_CANCELED)
@ -489,6 +487,7 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
dialog?.dismiss()
return
}
if (mSubscriber != null) {
mSubscriberViewContainer.removeView(mSubscriber!!.view)
mSession!!.unsubscribe(mSubscriber)
@ -503,6 +502,7 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
}
mSession!!.disconnect()
countDownTimer?.cancel()
videoCallPresenter.callChangeCallStatus(ChangeCallStatusRequestModel(16, sessionStatusModel!!.doctorId, sessionStatusModel!!.generalid, token, sessionStatusModel!!.vcid))
dialog?.dismiss()
}
@ -546,16 +546,27 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
400,
600
)
(mSubscriber!!.renderer as DynamicVideoRenderer).enableThumbnailCircle(false)
} else {
dialog?.window?.setLayout(
300,
300
)
(mSubscriber!!.renderer as DynamicVideoRenderer).enableThumbnailCircle(true)
}
isCircle = !isCircle
if (mSubscriber != null) {
(mSubscriber!!.renderer as DynamicVideoRenderer).enableThumbnailCircle(isCircle)
} else {
if (isCircle) {
videoCallContainer.background = ContextCompat.getDrawable(requireContext(), R.drawable.circle_shape)
mSubscriberViewContainer.background = ContextCompat.getDrawable(requireContext(), R.drawable.circle_shape)
} else {
videoCallContainer.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.text_color))
mSubscriberViewContainer.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.text_color))
}
}
if (isCircle) {
controlPanel.visibility = View.GONE
layoutMini.visibility = View.GONE
@ -583,7 +594,7 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
btnMinimize.setImageResource(res)
setViewsVisibility()
videoCallResponseListener?.minimizeVideoEvent(!isFullScreen)
// videoCallResponseListener?.minimizeVideoEvent(!isFullScreen)
}
private fun setViewsVisibility() {

@ -105,7 +105,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
StreamSubscription callTimer;
callConnected(){
callTimer = CountdownTimer(Duration(minutes: 1), Duration(seconds: 1)).listen(null)
callTimer = CountdownTimer(Duration(minutes: 90), Duration(seconds: 1)).listen(null)
..onDone(() {
callTimer.cancel();
})

Loading…
Cancel
Save