From 73cadb1c00d69e27dada08127d0e775c1561b5d5 Mon Sep 17 00:00:00 2001 From: mosazaid Date: Thu, 1 Jul 2021 16:25:23 +0300 Subject: [PATCH] make floating video screen --- .../app/src/main/kotlin/com/hmg/hmgDr/MainActivity.kt | 11 ++++++++--- .../hmgDr/Service/VideoStreamFloatingWidgetService.kt | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/android/app/src/main/kotlin/com/hmg/hmgDr/MainActivity.kt b/android/app/src/main/kotlin/com/hmg/hmgDr/MainActivity.kt index 4a7f1f94..670facf1 100644 --- a/android/app/src/main/kotlin/com/hmg/hmgDr/MainActivity.kt +++ b/android/app/src/main/kotlin/com/hmg/hmgDr/MainActivity.kt @@ -219,13 +219,18 @@ class MainActivity : FlutterFragmentActivity(), MethodChannel.MethodCallHandler, else { methodChannel.invokeMethod("onCallDisconnected", null) unbindService() - videoStreamService!!.serviceRunning = false + videoStreamService?.serviceRunning = false videoStreamService = null } } override fun onBackPressed() { - super.onBackPressed() + if (videoStreamService != null && videoStreamService?.serviceRunning == true && videoStreamService?.isFullScreen!!) { + videoStreamService!!.onMinimizedClicked() + } else { + super.onBackPressed() + } + } // override fun onStart() { @@ -244,7 +249,6 @@ class MainActivity : FlutterFragmentActivity(), MethodChannel.MethodCallHandler, startService(this) } bindService(this, serviceConnection, Context.BIND_AUTO_CREATE) - videoStreamService?.serviceRunning = true } } @@ -266,6 +270,7 @@ class MainActivity : FlutterFragmentActivity(), MethodChannel.MethodCallHandler, videoStreamService = binder.service bound = true videoStreamService!!.videoCallResponseListener = this@MainActivity // register + videoStreamService?.serviceRunning = true // videoStreamService!!.mActivity = this@MainActivity // register } diff --git a/android/app/src/main/kotlin/com/hmg/hmgDr/Service/VideoStreamFloatingWidgetService.kt b/android/app/src/main/kotlin/com/hmg/hmgDr/Service/VideoStreamFloatingWidgetService.kt index f3a93034..1ff2a2c2 100644 --- a/android/app/src/main/kotlin/com/hmg/hmgDr/Service/VideoStreamFloatingWidgetService.kt +++ b/android/app/src/main/kotlin/com/hmg/hmgDr/Service/VideoStreamFloatingWidgetService.kt @@ -103,7 +103,7 @@ class VideoStreamFloatingWidgetService : Service(), Session.SessionListener, private var isMicClicked = false private var elapsedTime: Long = 0 private var resume = false - private var isFullScreen: Boolean = true + var isFullScreen: Boolean = true private var isCircle: Boolean = false var arguments: Bundle? = null @@ -203,7 +203,7 @@ class VideoStreamFloatingWidgetService : Service(), Session.SessionListener, onCallClicked() } btnMinimize.setOnClickListener { - onMinimizedClicked(it) + onMinimizedClicked() } mCameraBtn.setOnClickListener { onCameraClicked(it) @@ -502,7 +502,7 @@ class VideoStreamFloatingWidgetService : Service(), Session.SessionListener, disconnectSession() } - private fun onMinimizedClicked(view: View?) { + fun onMinimizedClicked() { if (isFullScreen) { windowManagerParams.width = 400 windowManagerParams.height = 600