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 d3c58371..9d9581fe 100644 --- a/android/app/src/main/kotlin/com/hmg/hmgDr/MainActivity.kt +++ b/android/app/src/main/kotlin/com/hmg/hmgDr/MainActivity.kt @@ -43,27 +43,36 @@ class MainActivity : FlutterFragmentActivity(), MethodChannel.MethodCallHandler, this.result = result this.call = call - if (call.method == "openVideoCall") { - val apiKey = call.argument("kApiKey") - val sessionId = call.argument("kSessionId") - val token = call.argument("kToken") - val appLang = call.argument("appLang") - val baseUrl = call.argument("baseUrl") + when (call.method) { + "openVideoCall" -> { + val apiKey = call.argument("kApiKey") + val sessionId = call.argument("kSessionId") + val token = call.argument("kToken") + val appLang = call.argument("appLang") + val baseUrl = call.argument("baseUrl") - // Session Status model - val VC_ID = call.argument("VC_ID") - val tokenID = call.argument("TokenID") - val generalId = call.argument("generalId") - val doctorId = call.argument("DoctorId") - val patientName = call.argument("patientName") + // Session Status model + val VC_ID = call.argument("VC_ID") + val tokenID = call.argument("TokenID") + val generalId = call.argument("generalId") + val doctorId = call.argument("DoctorId") + val patientName = call.argument("patientName") - val sessionStatusModel = GetSessionStatusModel(VC_ID, tokenID, generalId, doctorId, patientName) + val sessionStatusModel = GetSessionStatusModel(VC_ID, tokenID, generalId, doctorId, patientName) - openVideoCall(apiKey, sessionId, token, appLang, baseUrl, sessionStatusModel) + openVideoCall(apiKey, sessionId, token, appLang, baseUrl, sessionStatusModel) - } else { - result.notImplemented() + } + "closeVideoCall" -> { + dialogFragment?.onCallClicked() + } + "onCallConnected"->{ + + } + else -> { + result.notImplemented() + } } } @@ -94,6 +103,9 @@ class MainActivity : FlutterFragmentActivity(), MethodChannel.MethodCallHandler, it.isCancelable = true it.show(transaction, "dialog") } + } else if (!dialogFragment!!.isVisible){ + val transaction = supportFragmentManager.beginTransaction() + dialogFragment!!.show(transaction, "dialog") } } @@ -148,7 +160,8 @@ class MainActivity : FlutterFragmentActivity(), MethodChannel.MethodCallHandler, } override fun errorHandle(message: String) { - Toast.makeText(this, message, Toast.LENGTH_LONG).show() + dialogFragment = null +// Toast.makeText(this, message, Toast.LENGTH_LONG).show() } diff --git a/android/app/src/main/kotlin/com/hmg/hmgDr/ui/VideoCallActivity.java b/android/app/src/main/kotlin/com/hmg/hmgDr/ui/VideoCallActivity.java index 0fb061f1..daf372ed 100644 --- a/android/app/src/main/kotlin/com/hmg/hmgDr/ui/VideoCallActivity.java +++ b/android/app/src/main/kotlin/com/hmg/hmgDr/ui/VideoCallActivity.java @@ -415,7 +415,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi if (mPublisher != null) { isSwitchCameraClicked = !isSwitchCameraClicked; mPublisher.cycleCamera(); - int res = isSwitchCameraClicked ? R.drawable.flip_disapled : R.drawable.flip_enabled; + int res = isSwitchCameraClicked ? R.drawable.camera_front : R.drawable.camera_back; mSwitchCameraBtn.setImageResource(res); } } diff --git a/android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt b/android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt index 6c07f462..e0a92206 100644 --- a/android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt +++ b/android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt @@ -229,7 +229,7 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session videoCallPresenter = VideoCallPresenterImpl(this, baseUrl) mCallBtn = view.findViewById(R.id.btn_call) mCallBtn.setOnClickListener { - onCallClicked(it) + onCallClicked() } btnMinimize = view.findViewById(R.id.btn_minimize) btnMinimize.setOnClickListener { @@ -355,8 +355,8 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session override fun onError(session: Session, opentokError: OpentokError) { Log.d(TAG, "onError: Error (" + opentokError.message + ") in session " + session.sessionId) - videoCallResponseListener?.errorHandle("onError: Error (" + opentokError.message + ") in session ") - dialog?.dismiss() + videoCallResponseListener?.errorHandle("Error (" + opentokError.message + ") in session ") +// dialog?.dismiss() } override fun onStreamReceived(session: Session, stream: Stream) { @@ -393,8 +393,8 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session override fun onError(publisherKit: PublisherKit?, opentokError: OpentokError) { Log.d(VideoCallFragment.TAG, "onError: Error (" + opentokError.message + ") in publisher") - videoCallResponseListener?.errorHandle("onError: Error (" + opentokError.message + ") in publisher") - dialog?.dismiss() + videoCallResponseListener?.errorHandle("Error (" + opentokError.message + ") in publisher") +// dialog?.dismiss() } override fun onVideoDataReceived(subscriberKit: SubscriberKit?) { @@ -465,12 +465,12 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session if (mPublisher != null) { isSwitchCameraClicked = !isSwitchCameraClicked mPublisher!!.cycleCamera() - val res = if (isSwitchCameraClicked) R.drawable.flip_disapled else R.drawable.flip_enabled - mSwitchCameraBtn!!.setImageResource(res) + val res = if (isSwitchCameraClicked) R.drawable.camera_front else R.drawable.camera_back + mSwitchCameraBtn.setImageResource(res) } } - private fun onCallClicked(view: View?) { + fun onCallClicked() { disconnectSession() } @@ -487,6 +487,9 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session ) } isFullScreen = !isFullScreen + + val res = if (isFullScreen) R.drawable.reducing else R.drawable.expand + btnMinimize.setImageResource(res) setViewsVisibility() } @@ -518,7 +521,7 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session layoutName.visibility = View.VISIBLE mCameraBtn.visibility = View.VISIBLE mSwitchCameraBtn.visibility = View.VISIBLE - mspeckerBtn.visibility = View.VISIBLE +// mspeckerBtn.visibility = View.VISIBLE mMicBtn.visibility = View.VISIBLE mPublisherViewContainer.visibility = View.VISIBLE @@ -539,7 +542,7 @@ class VideoCallFragment : DialogFragment(), PermissionCallbacks, Session.Session layoutName.visibility = View.GONE mCameraBtn.visibility = View.GONE mSwitchCameraBtn.visibility = View.GONE - mspeckerBtn.visibility = View.GONE +// mspeckerBtn.visibility = View.GONE mMicBtn.visibility = View.GONE mPublisherViewContainer.visibility = View.GONE diff --git a/android/app/src/main/res/drawable/call.png b/android/app/src/main/res/drawable/call.png index fc00f4f9..52f8e267 100644 Binary files a/android/app/src/main/res/drawable/call.png and b/android/app/src/main/res/drawable/call.png differ diff --git a/android/app/src/main/res/drawable/camera_back.png b/android/app/src/main/res/drawable/camera_back.png new file mode 100644 index 00000000..c3d63ac3 Binary files /dev/null and b/android/app/src/main/res/drawable/camera_back.png differ diff --git a/android/app/src/main/res/drawable/camera_front.png b/android/app/src/main/res/drawable/camera_front.png new file mode 100644 index 00000000..332ab0f5 Binary files /dev/null and b/android/app/src/main/res/drawable/camera_front.png differ diff --git a/android/app/src/main/res/drawable/expand.png b/android/app/src/main/res/drawable/expand.png new file mode 100644 index 00000000..7020dc2e Binary files /dev/null and b/android/app/src/main/res/drawable/expand.png differ diff --git a/android/app/src/main/res/drawable/flip_disapled.png b/android/app/src/main/res/drawable/flip_disapled.png deleted file mode 100644 index 5226029e..00000000 Binary files a/android/app/src/main/res/drawable/flip_disapled.png and /dev/null differ diff --git a/android/app/src/main/res/drawable/flip_enabled.png b/android/app/src/main/res/drawable/flip_enabled.png deleted file mode 100644 index 152dc10e..00000000 Binary files a/android/app/src/main/res/drawable/flip_enabled.png and /dev/null differ diff --git a/android/app/src/main/res/drawable/ic_mini.xml b/android/app/src/main/res/drawable/ic_mini.xml deleted file mode 100644 index 29df8da2..00000000 --- a/android/app/src/main/res/drawable/ic_mini.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/android/app/src/main/res/drawable/mic_disabled.png b/android/app/src/main/res/drawable/mic_disabled.png index 3603df75..266cb6c7 100644 Binary files a/android/app/src/main/res/drawable/mic_disabled.png and b/android/app/src/main/res/drawable/mic_disabled.png differ diff --git a/android/app/src/main/res/drawable/mic_enabled.png b/android/app/src/main/res/drawable/mic_enabled.png index 5d9aa677..ef7617f7 100644 Binary files a/android/app/src/main/res/drawable/mic_enabled.png and b/android/app/src/main/res/drawable/mic_enabled.png differ diff --git a/android/app/src/main/res/drawable/reducing.png b/android/app/src/main/res/drawable/reducing.png new file mode 100644 index 00000000..59f2c9e6 Binary files /dev/null and b/android/app/src/main/res/drawable/reducing.png differ diff --git a/android/app/src/main/res/drawable/video_disanabled.png b/android/app/src/main/res/drawable/video_disanabled.png index 5c20c7bd..d6ccbe7a 100644 Binary files a/android/app/src/main/res/drawable/video_disanabled.png and b/android/app/src/main/res/drawable/video_disanabled.png differ diff --git a/android/app/src/main/res/drawable/video_enabled.png b/android/app/src/main/res/drawable/video_enabled.png index 23331e30..6fcbe750 100644 Binary files a/android/app/src/main/res/drawable/video_enabled.png and b/android/app/src/main/res/drawable/video_enabled.png differ diff --git a/android/app/src/main/res/layout/activity_video_call.xml b/android/app/src/main/res/layout/activity_video_call.xml index 586f5b60..6dbdaa1f 100644 --- a/android/app/src/main/res/layout/activity_video_call.xml +++ b/android/app/src/main/res/layout/activity_video_call.xml @@ -38,7 +38,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/white" - android:textSize="20sp" + android:textSize="16sp" + android:padding="4dp" android:textStyle="bold" tools:text="25:45" /> @@ -89,18 +90,6 @@ android:src="@drawable/video_off_fill" /> - - @@ -152,6 +141,17 @@ app:layout_constraintStart_toEndOf="@id/btn_camera" app:layout_constraintTop_toTopOf="parent" /> + + diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml index 2a4d695f..0694f5f4 100644 --- a/android/app/src/main/res/values/dimens.xml +++ b/android/app/src/main/res/values/dimens.xml @@ -29,7 +29,7 @@ 14sp 16sp - 24sp + 22sp 4dp