omikit-plugin 2.3.4 → 3.0.0

package/android/src/main/java/com/omikitplugin/OmikitPluginModule.kt

@@ -12,12 +12,12 @@ import android.provider.Settings
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.ActivityCompat
-import androidx.core.app.ActivityCompat.startActivityForResult
 import androidx.core.content.ContextCompat
 import com.facebook.react.ReactActivity
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter
 import com.omikitplugin.constants.*
+import com.omikitplugin.state.CallState
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -25,7 +25,9 @@ import kotlinx.coroutines.withContext
 import vn.vihat.omicall.omisdk.OmiAccountListener
 import vn.vihat.omicall.omisdk.OmiClient
 import vn.vihat.omicall.omisdk.OmiListener
+import vn.vihat.omicall.omisdk.service.NotificationService
 import vn.vihat.omicall.omisdk.utils.OmiSDKUtils
+import vn.vihat.omicall.omisdk.utils.OmiStartCallStatus
 import vn.vihat.omicall.omisdk.utils.SipServiceConstants
 
 
@@ -37,41 +39,49 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     return NAME
   }
 
-  override fun incomingReceived(callerId: Int, phoneNumber: String?, isVideo: Boolean?) {
+  override fun incomingReceived(callerId: Int?, phoneNumber: String?, isVideo: Boolean?) {
     val map: WritableMap = WritableNativeMap()
     map.putBoolean("isVideo", isVideo ?: true)
     map.putString("callerNumber", phoneNumber)
-    sendEvent(INCOMING_RECEIVED, map)
+    map.putInt("status", CallState.incoming.value)
+    sendEvent(CALL_STATE_CHANGED, map)
     Log.d("omikit", "incomingReceived: ")
   }
 
-  override fun onCallEnd(callInfo: Any?, statusCode: Int) {
-    if (callInfo is Map<*, *>) {
-      val call = callInfo as Map<*, *>
-      val map: WritableMap = WritableNativeMap()
-      val timeStartToAnswer = call["time_start_to_answer"] as Long?
-      val timeEnd = call["time_end"] as Long
-      map.putString("transaction_id", call["transaction_id"] as String?)
-      map.putString("direction", call["direction"] as String)
-      map.putString("source_number", call["source_number"] as String)
-      map.putString("destination_number", call["destination_number"] as String)
-      map.putDouble("time_start_to_answer", (timeStartToAnswer ?: 0).toDouble())
-      map.putDouble("time_end", timeEnd.toDouble())
-      map.putString("sip_user", call["sip_user"] as String)
-      map.putString("disposition", call["disposition"] as String)
-      sendEvent(CALL_END, map)
-    } else {
-      sendEvent(CALL_END, null)
-    }
-  }
-
-  override fun networkHealth(mos: Float, quality: Int) {
+  override fun networkHealth(stat: Map<String, *>, quality: Int) {
     val map: WritableMap = WritableNativeMap()
     map.putInt("quality", quality)
-    map.putDouble("mos", mos.toDouble())
     sendEvent(CALL_QUALITY, map)
   }
 
+  override fun onAudioChanged(audioInfo: Map<String, Any>) {
+    val audio: WritableMap = WritableNativeMap()
+    audio.putString("name", audioInfo["name"] as String)
+    audio.putInt("type", audioInfo["type"] as Int)
+    val map: WritableMap = WritableNativeMap()
+    val writeList = WritableNativeArray()
+    writeList.pushMap(audio)
+    map.putArray("data", writeList)
+    sendEvent(AUDIO_CHANGE, map)
+  }
+
+  override fun onCallEnd(callInfo: MutableMap<String, Any?>, statusCode: Int) {
+    val call = callInfo as Map<*, *>
+    val map: WritableMap = WritableNativeMap()
+    val timeStartToAnswer = call["time_start_to_answer"] as Long?
+    val timeEnd = call["time_end"] as Long
+    map.putString("transaction_id", call["transaction_id"] as String?)
+    map.putString("direction", call["direction"] as String)
+    map.putString("source_number", call["source_number"] as String)
+    map.putString("destination_number", call["destination_number"] as String)
+    map.putDouble("time_start_to_answer", (timeStartToAnswer ?: 0).toDouble())
+    map.putDouble("time_end", timeEnd.toDouble())
+    map.putString("sip_user", call["sip_user"] as String)
+    map.putString("disposition", call["disposition"] as String)
+    map.putInt("status", CallState.disconnected.value)
+    sendEvent(CALL_STATE_CHANGED, map)
+  }
+
   override fun onCallEstablished(
     callerId: Int,
     phoneNumber: String?,
@@ -85,31 +95,43 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       map.putString("callerNumber", phoneNumber)
       map.putBoolean("isVideo", isVideo ?: true)
       map.putString("transactionId", transactionId)
-      sendEvent(CALL_ESTABLISHED, map)
+      map.putInt("status", CallState.confirmed.value)
+      sendEvent(CALL_STATE_CHANGED, map)
     }, 500)
   }
 
-  override fun onConnectionTimeout() {
-  //      sendEvent("onConnectionTimeout", null)
+  override fun onConnecting() {
+    val map: WritableMap = WritableNativeMap()
+    map.putString("callerNumber", "")
+    map.putBoolean("isVideo", NotificationService.isVideo)
+    map.putString("transactionId", "")
+    map.putInt("status", CallState.connecting.value)
+    sendEvent(CALL_STATE_CHANGED, map)
   }
 
+
   override fun onHold(isHold: Boolean) {
-  //      val map: WritableMap = WritableNativeMap()
-  //      map.putBoolean("isHold", isHold)
-  //      sendEvent(HOLD, map)
   }
 
   override fun onMuted(isMuted: Boolean) {
-  //      val map: WritableMap = WritableNativeMap()
-  //      map.putBoolean("isMuted", isMuted)
-  //      sendEvent(MUTED, map)
   }
 
   override fun onOutgoingStarted(callerId: Int, phoneNumber: String?, isVideo: Boolean?) {
-
+    val map: WritableMap = WritableNativeMap()
+    map.putString("callerNumber", "")
+    map.putBoolean("isVideo", NotificationService.isVideo)
+    map.putString("transactionId", "")
+    map.putInt("status", CallState.calling.value)
+    sendEvent(CALL_STATE_CHANGED, map)
   }
 
-  override fun onRinging() {
+  override fun onRinging(callerId: Int, transactionId: String?) {
+    val map: WritableMap = WritableNativeMap()
+    map.putString("callerNumber", "")
+    map.putBoolean("isVideo", false)
+    map.putString("transactionId", transactionId ?: "")
+    map.putInt("status", CallState.early.value)
+    sendEvent(CALL_STATE_CHANGED, map)
   }
 
   override fun onSwitchBoardAnswer(sip: String) {
@@ -125,8 +147,6 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   private val accountListener = object : OmiAccountListener {
     override fun onAccountStatus(online: Boolean) {
       Log.d("aaa", "Account status $online")
-//            initResult?.success(online)
-//            initResult = null
     }
   }
 
@@ -135,7 +155,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     reactApplicationContext!!.addActivityEventListener(this)
     Handler(Looper.getMainLooper()).post {
       OmiClient(context = reactApplicationContext!!)
-      OmiClient.instance.setListener(this)
+      OmiClient.instance.addCallStateListener(this)
     }
   }
 
@@ -152,12 +172,14 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       promise.resolve(result)
   }
 
+  @RequiresApi(Build.VERSION_CODES.M)
   @ReactMethod
   fun openSystemAlertSetting(promise: Promise) {
     val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
       Uri.parse("package:" + reactApplicationContext.packageName))
     intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
     reactApplicationContext.startActivity(intent)
+    promise.resolve(true)
   }
 
   @ReactMethod
@@ -173,6 +195,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       val userImage = data.getString("userImage")
       val userNameKey = data.getString("userNameKey")
       val channelId = data.getString("channelId")
+      val audioNotificationDescription = data.getString("audioNotificationDescription")
+      val videoNotificationDescription = data.getString("videoNotificationDescription")
       OmiClient.instance.configPushNotification(
         notificationIcon = notificationIcon ?: "",
         prefix = prefix ?: "Cuộc gọi tới từ: ",
@@ -182,9 +206,13 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         backImage = backImage ?: "ic_back",
         userImage = userImage ?: "calling_face",
         prefixMissedCallMessage = prefixMissedCallMessage ?: "Cuộc gọi nhỡ từ",
-        missedCallTitle = prefixMissedCallMessage ?: "Cuộc gọi nhỡ",
         userNameKey = userNameKey ?: "extension",
         channelId = channelId ?: "",
+        ringtone = null,
+        fullScreenUserImage = userImage ?: "calling_face",
+        showUserInfoInFullScreen = false,
+        audioNotificationDescription = audioNotificationDescription,
+        videoNotificationDescription = videoNotificationDescription
       )
       promise.resolve(true)
     }
@@ -202,8 +230,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         OmiClient.register(
           userName,
           password,
-          isVideo,
           realm,
+          isVideo,
           host,
         )
       }
@@ -220,6 +248,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       val usrUuid = data.getString("usrUuid")
       val apiKey = data.getString("apiKey")
       val isVideo = data.getBoolean("isVideo")
+      val phone = data.getString("phone")
       withContext(Dispatchers.Default) {
         try {
           if (usrName != null && usrUuid != null && apiKey != null) {
@@ -227,7 +256,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
               apiKey = apiKey,
               userName = usrName,
               uuid = usrUuid,
-              isVideo,
+              phone = phone ?: "",
+              isVideo = isVideo,
             )
           }
         } catch (_: Throwable) {
@@ -243,7 +273,17 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun getInitialCall(promise: Promise) {
     currentActivity?.runOnUiThread {
-      promise.resolve(false)
+      val call = OmiClient.instance.getCurrentCallInfo()
+      if (call != null) {
+        val map: WritableMap = WritableNativeMap()
+        map.putString("callerNumber", call["callerNumber"] as String)
+        map.putInt("status", call["status"] as Int)
+        map.putBoolean("muted", call["muted"] as Boolean)
+        map.putBoolean("isVideo", call["isVideo"] as Boolean)
+        promise.resolve(map)
+      } else {
+        promise.resolve(false)
+      }
     }
   }
 
@@ -293,7 +333,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       )
     if (audio == PackageManager.PERMISSION_GRANTED) {
       mainScope.launch {
-        var callResult = false
+        var callResult: OmiStartCallStatus? = null
         withContext(Dispatchers.Default) {
           try {
             val uuid = data.getString("usrUuid") as String
@@ -321,24 +361,19 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun endCall(promise: Promise) {
     currentActivity?.runOnUiThread {
-      val callInfo = OmiClient.instance.hangUp()
-      if (callInfo is Map<*, *>) {
-        val call = callInfo as Map<*, *>
-        val map: WritableMap = WritableNativeMap()
-        val timeStartToAnswer = call["time_start_to_answer"] as Long?
-        val timeEnd = call["time_end"] as Long
-        map.putString("transaction_id", call["transaction_id"] as String?)
-        map.putString("direction", call["direction"] as String)
-        map.putString("source_number", call["source_number"] as String)
-        map.putString("destination_number", call["destination_number"] as String)
-        map.putDouble("time_start_to_answer", (timeStartToAnswer ?: 0).toDouble())
-        map.putDouble("time_end", timeEnd.toDouble())
-        map.putString("sip_user", call["sip_user"] as String)
-        map.putString("disposition", call["disposition"] as String)
-        sendEvent(CALL_END, map)
-      } else {
-        promise.resolve(null)
-      }
+      val call = OmiClient.instance.hangUp()
+      val map: WritableMap = WritableNativeMap()
+      val timeStartToAnswer = call?.get("time_start_to_answer") as Long?
+      val timeEnd = call?.get("time_end") as Long
+      map.putString("transaction_id", call["transaction_id"] as String?)
+      map.putString("direction", call["direction"] as String)
+      map.putString("source_number", call["source_number"] as String)
+      map.putString("destination_number", call["destination_number"] as String)
+      map.putDouble("time_start_to_answer", (timeStartToAnswer ?: 0).toDouble())
+      map.putDouble("time_end", timeEnd.toDouble())
+      map.putString("sip_user", call["sip_user"] as String)
+      map.putString("disposition", call["disposition"] as String)
+      promise.resolve(map)
     }
   }
 
@@ -401,34 +436,6 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     }
   }
 
-  @ReactMethod
-  fun omiInputs(promise: Promise) {
-    currentActivity?.runOnUiThread {
-      val inputs = OmiClient.instance.getAudioInputs()
-      val allAudios = inputs.map {
-        mapOf(
-          "name" to it.first,
-          "id" to it.second,
-        )
-      }.toTypedArray()
-      promise.resolve(allAudios)
-    }
-  }
-
-  @ReactMethod
-  fun omiOutputs(promise: Promise) {
-    currentActivity?.runOnUiThread {
-      val inputs = OmiClient.instance.getAudioOutputs()
-      val allAudios = inputs.map {
-        mapOf(
-          "name" to it.first,
-          "id" to it.second,
-        )
-      }.toTypedArray()
-      promise.resolve(allAudios)
-    }
-  }
-
   @ReactMethod
   fun logout(promise: Promise) {
     mainScope.launch {
@@ -517,6 +524,37 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     }
   }
 
+  @ReactMethod
+  fun getAudio(promise: Promise) {
+    val inputs = OmiClient.instance.getAudioOutputs()
+    val writeList = WritableNativeArray()
+    inputs.forEach {
+      val map = WritableNativeMap()
+      map.putString("name", it["name"] as String)
+      map.putInt("type", it["type"] as Int)
+      writeList.pushMap(map)
+    }
+    promise.resolve(writeList)
+  }
+
+  @ReactMethod
+  fun getCurrentAudio(promise: Promise) {
+    val currentAudio = OmiClient.instance.getCurrentAudio()
+    val map: WritableMap = WritableNativeMap()
+    map.putString("name", currentAudio["name"] as String)
+    map.putInt("type", currentAudio["type"] as Int)
+    val writeList = WritableNativeArray()
+    writeList.pushMap(map)
+    promise.resolve(writeList)
+  }
+
+  @ReactMethod
+  fun setAudio(data: ReadableMap, promise: Promise) {
+    val portType = data.getInt("portType")
+    OmiClient.instance.setAudio(portType)
+    promise.resolve(true)
+  }
+
   companion object {
     const val NAME = "OmikitPlugin"
     fun onDestroy() {
@@ -536,9 +574,11 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   private fun sendEvent(eventName: String?, params: Any?) {
-    currentActivity!!.runOnUiThread {
-      reactApplicationContext.getJSModule(RCTNativeAppEventEmitter::class.java)
-        .emit(eventName, params)
+    if (currentActivity != null) {
+      currentActivity!!.runOnUiThread {
+        reactApplicationContext.getJSModule(RCTNativeAppEventEmitter::class.java)
+          .emit(eventName, params)
+      }
     }
   }
 

package/android/src/main/java/com/omikitplugin/constants/constant.kt

@@ -26,12 +26,11 @@ const val GET_GUEST_USER = "GET_GUEST_USER"
 const val GET_USER_INFO = "GET_USER_INFO"
 
 //LISTENER
-const val CALL_ESTABLISHED = "CALL_ESTABLISHED"
-const val CALL_END = "CALL_END"
-const val INCOMING_RECEIVED = "INCOMING_RECEIVED"
+const val CALL_STATE_CHANGED = "CALL_STATE_CHANGED"
 const val VIDEO = "VIDEO"
 const val SPEAKER = "SPEAKER"
 const val MUTED = "MUTED"
 const val CLICK_MISSED_CALL = "CLICK_MISSED_CALL"
 const val SWITCHBOARD_ANSWER = "SWITCHBOARD_ANSWER"
 const val CALL_QUALITY = "CALL_QUALITY"
+const val AUDIO_CHANGE = "AUDIO_CHANGE"

package/android/src/main/java/com/omikitplugin/state/CallState.kt

@@ -0,0 +1,12 @@
+package com.omikitplugin.state
+
+enum class CallState(_value: Int) {
+  calling(0),
+  early(1),
+  connecting(2),
+  confirmed(3),
+  incoming(4),
+  disconnected(5);
+
+  val value = _value
+}