video fix bugs

merge-requests/745/head
mosazaid 5 years ago
parent 259a63384e
commit 1ed22e68e3

@ -325,7 +325,7 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
Log.i(TAG, "Session Connected") Log.i(TAG, "Session Connected")
mPublisher = Publisher.Builder(requireContext()).build() mPublisher = Publisher.Builder(requireContext()).build()
mPublisher!!.setPublisherListener(this) mPublisher!!.setPublisherListener(this)
mPublisherViewContainer!!.addView(mPublisher!!.view) mPublisherViewContainer.addView(mPublisher!!.view)
if (mPublisher!!.getView() is GLSurfaceView) { if (mPublisher!!.getView() is GLSurfaceView) {
(mPublisher!!.getView() as GLSurfaceView).setZOrderOnTop(true) (mPublisher!!.getView() as GLSurfaceView).setZOrderOnTop(true)
} }
@ -490,42 +490,37 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
val btnMinimizeLayoutParam: ConstraintLayout.LayoutParams = btnMinimize.layoutParams as ConstraintLayout.LayoutParams val btnMinimizeLayoutParam: ConstraintLayout.LayoutParams = btnMinimize.layoutParams as ConstraintLayout.LayoutParams
val mCallBtnLayoutParam: ConstraintLayout.LayoutParams = mCallBtn.layoutParams as ConstraintLayout.LayoutParams val mCallBtnLayoutParam: ConstraintLayout.LayoutParams = mCallBtn.layoutParams as ConstraintLayout.LayoutParams
// val localPreviewMargin : Int = context!!.resources.getDimension(R.dimen.local_preview_margin_top).toInt() val localPreviewMargin : Int = context!!.resources.getDimension(R.dimen.local_preview_margin_top).toInt()
// val localPreviewWidth : Int = context!!.resources.getDimension(R.dimen.local_preview_width).toInt() val localPreviewWidth : Int = context!!.resources.getDimension(R.dimen.local_preview_width).toInt()
// val localPreviewHeight : Int = context!!.resources.getDimension(R.dimen.local_preview_height).toInt() val localPreviewHeight : Int = context!!.resources.getDimension(R.dimen.local_preview_height).toInt()
// val localPreviewIconSize: Int = context!!.resources.getDimension(R.dimen.local_back_icon_size).toInt() // val localPreviewIconSize: Int = context!!.resources.getDimension(R.dimen.local_back_icon_size).toInt()
// val localPreviewMarginSmall : Int = context!!.resources.getDimension(R.dimen.local_preview_margin_small).toInt() // val localPreviewMarginSmall : Int = context!!.resources.getDimension(R.dimen.local_preview_margin_small).toInt()
// val localPreviewWidthSmall : Int = context!!.resources.getDimension(R.dimen.local_preview_width_small).toInt() // val localPreviewWidthSmall : Int = context!!.resources.getDimension(R.dimen.local_preview_width_small).toInt()
// val localPreviewHeightSmall : Int = context!!.resources.getDimension(R.dimen.local_preview_height_small).toInt() // val localPreviewHeightSmall : Int = context!!.resources.getDimension(R.dimen.local_preview_height_small).toInt()
// val localPreviewIconSmall: Int = context!!.resources.getDimension(R.dimen.local_back_icon_size_small).toInt() // val localPreviewIconSmall: Int = context!!.resources.getDimension(R.dimen.local_back_icon_size_small).toInt()
// val localPreviewLayoutIconParam : FrameLayout.LayoutParams // val localPreviewLayoutIconParam : FrameLayout.LayoutParams
// val localPreviewLayoutParam : RelativeLayout.LayoutParams = mPublisherViewContainer.layoutParams as RelativeLayout.LayoutParams val localPreviewLayoutParam : RelativeLayout.LayoutParams = mPublisherViewContainer.layoutParams as RelativeLayout.LayoutParams
val remotePreviewIconSize: Int = context!!.resources.getDimension(R.dimen.remote_back_icon_size).toInt() val remotePreviewIconSize: Int = context!!.resources.getDimension(R.dimen.remote_back_icon_size).toInt()
val remotePreviewIconSizeSmall: Int = context!!.resources.getDimension(R.dimen.remote_back_icon_size_small).toInt() val remotePreviewIconSizeSmall: Int = context!!.resources.getDimension(R.dimen.remote_back_icon_size_small).toInt()
val remotePreviewLayoutParam: FrameLayout.LayoutParams = mSubscriberViewIcon.layoutParams as FrameLayout.LayoutParams val remotePreviewLayoutParam: FrameLayout.LayoutParams = mSubscriberViewIcon.layoutParams as FrameLayout.LayoutParams
val constraintSet = ConstraintSet()
//layoutParam.constrain
// constraintSet.
if (isFullScreen) { if (isFullScreen) {
layoutName.visibility = View.VISIBLE layoutName.visibility = View.VISIBLE
mCameraBtn.visibility = View.VISIBLE mCameraBtn.visibility = View.VISIBLE
mSwitchCameraBtn.visibility = View.VISIBLE mSwitchCameraBtn.visibility = View.VISIBLE
// mspeckerBtn.visibility = View.VISIBLE // mspeckerBtn.visibility = View.VISIBLE
mMicBtn.visibility = View.VISIBLE mMicBtn.visibility = View.VISIBLE
mPublisherViewContainer.visibility = View.VISIBLE
// layoutParam = ConstraintLayout.LayoutParams(iconSize, iconSize)
btnMinimizeLayoutParam.width = iconSize btnMinimizeLayoutParam.width = iconSize
btnMinimizeLayoutParam.height = iconSize btnMinimizeLayoutParam.height = iconSize
mCallBtnLayoutParam.width = iconSize mCallBtnLayoutParam.width = iconSize
mCallBtnLayoutParam.height = iconSize mCallBtnLayoutParam.height = iconSize
// localPreviewLayoutIconParam = FrameLayout.LayoutParams(localPreviewIconSize, localPreviewIconSize) // localPreviewLayoutIconParam = FrameLayout.LayoutParams(localPreviewIconSize, localPreviewIconSize)
//// localPreviewLayoutParam = RelativeLayout.LayoutParams(localPreviewWidth, localPreviewHeight) //// localPreviewLayoutParam = RelativeLayout.LayoutParams(localPreviewWidth, localPreviewHeight)
// localPreviewLayoutParam.width = localPreviewIconSize localPreviewLayoutParam.width = localPreviewWidth
// localPreviewLayoutParam.height = localPreviewIconSize localPreviewLayoutParam.height = localPreviewHeight
// localPreviewLayoutParam.setMargins(0,localPreviewMargin, localPreviewMargin, 0) localPreviewLayoutParam.setMargins(0,localPreviewMargin, localPreviewMargin, 0)
// remotePreviewLayoutParam = FrameLayout.LayoutParams(remotePreviewIconSize, remotePreviewIconSize) // remotePreviewLayoutParam = FrameLayout.LayoutParams(remotePreviewIconSize, remotePreviewIconSize)
remotePreviewLayoutParam.width = remotePreviewIconSize remotePreviewLayoutParam.width = remotePreviewIconSize
remotePreviewLayoutParam.height = remotePreviewIconSize remotePreviewLayoutParam.height = remotePreviewIconSize
@ -535,7 +530,8 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
mSwitchCameraBtn.visibility = View.GONE mSwitchCameraBtn.visibility = View.GONE
// mspeckerBtn.visibility = View.GONE // mspeckerBtn.visibility = View.GONE
mMicBtn.visibility = View.GONE mMicBtn.visibility = View.GONE
mPublisherViewContainer.visibility = View.GONE // mPublisherViewContainer.visibility = View.GONE
// mPublisherViewIcon.visibility = View.GONE
// layoutParam = ConstraintLayout.LayoutParams(iconSizeSmall, iconSizeSmall) // layoutParam = ConstraintLayout.LayoutParams(iconSizeSmall, iconSizeSmall)
btnMinimizeLayoutParam.width = iconSizeSmall btnMinimizeLayoutParam.width = iconSizeSmall
@ -543,6 +539,9 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
mCallBtnLayoutParam.width = iconSizeSmall mCallBtnLayoutParam.width = iconSizeSmall
mCallBtnLayoutParam.height = iconSizeSmall mCallBtnLayoutParam.height = iconSizeSmall
localPreviewLayoutParam.width = 0
localPreviewLayoutParam.height = 0
localPreviewLayoutParam.setMargins(0,localPreviewMargin / 2, localPreviewMargin/ 2, 0)
// localPreviewLayoutIconParam = FrameLayout.LayoutParams(localPreviewIconSmall, localPreviewIconSmall) // localPreviewLayoutIconParam = FrameLayout.LayoutParams(localPreviewIconSmall, localPreviewIconSmall)
//// localPreviewLayoutParam = RelativeLayout.LayoutParams(localPreviewWidthSmall, localPreviewHeightSmall) //// localPreviewLayoutParam = RelativeLayout.LayoutParams(localPreviewWidthSmall, localPreviewHeightSmall)
// localPreviewLayoutParam.width = localPreviewWidthSmall // localPreviewLayoutParam.width = localPreviewWidthSmall
@ -553,7 +552,7 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session
remotePreviewLayoutParam.height = remotePreviewIconSizeSmall remotePreviewLayoutParam.height = remotePreviewIconSizeSmall
} }
// mPublisherViewContainer.layoutParams = localPreviewLayoutParam mPublisherViewContainer.layoutParams = localPreviewLayoutParam
// mPublisherViewIcon.layoutParams = localPreviewLayoutIconParam // mPublisherViewIcon.layoutParams = localPreviewLayoutIconParam
mSubscriberViewIcon.layoutParams = remotePreviewLayoutParam mSubscriberViewIcon.layoutParams = remotePreviewLayoutParam

Loading…
Cancel
Save