omikit-plugin 3.0.3 → 3.0.5

package/android/build.gradle

@@ -107,7 +107,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   // implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
-  api 'vn.vihat.omicall:omi-sdk:2.0.19'
+  api 'vn.vihat.omicall:omi-sdk:2.0.23'
 //    implementation fileTree(include: ['*.jar'], dir: 'libs')
 //    implementation files('OmiSDK.aar')
   implementation "com.google.android.flexbox:flexbox:3.0.0"
@@ -119,7 +119,7 @@ dependencies {
     exclude module: 'okhttp'
   }
   implementation "com.squareup.retrofit2:converter-gson:2.9.0"
-  implementation "com.squareup.okhttp3:okhttp:4.9.1"
+  implementation "com.squareup.okhttp3:okhttp:4.9.1"  
   implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.1"
   implementation "com.squareup.okhttp3:logging-interceptor:4.9.1"
   implementation "com.google.code.gson:gson:2.8.9"

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

@@ -45,6 +45,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
   override fun incomingReceived(callerId: Int?, phoneNumber: String?, isVideo: Boolean?) {
     isIncomming = true;
+       Log.d("OMISDK", "=>> START IN COMMING CALL REVICED => ")
     val map: WritableMap = WritableNativeMap()
     map.putBoolean("isVideo", isVideo ?: true)
     map.putBoolean("incoming", isIncomming)
@@ -63,6 +64,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     transactionId: String?,
   ) {
     isAnserCall = true
+    Log.d("OMISDK", "=>> ON CALL ESTABLISHED => ")
     Handler(Looper.getMainLooper()).postDelayed({
       Log.d("OmikitReactNative", "onCallEstablished")
       val map: WritableMap = WritableNativeMap()
@@ -72,10 +74,11 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       map.putString("transactionId", transactionId)
       map.putInt("status", CallState.confirmed.value)
       sendEvent(CALL_STATE_CHANGED, map)
-    }, 500)
+    }, 200)
   }
 
   override fun onCallEnd(callInfo: MutableMap<String, Any?>, statusCode: Int) {
+      Log.d("OMISDK", "=>> ON CALL END => ")
     val call = callInfo as Map<*, *>
     val map: WritableMap = WritableNativeMap()
     val timeStartToAnswer = call["time_start_to_answer"] as Long?
@@ -93,6 +96,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onConnecting() {
+    Log.d("OMISDK", "=>> ON CONNECTING CALL => ")
     val map: WritableMap = WritableNativeMap()
     map.putString("callerNumber", "")
     map.putBoolean("isVideo", NotificationService.isVideo)
@@ -108,6 +112,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     val map: WritableMap = WritableNativeMap()
 
     if(callDirection == "inbound") {
+       Log.d("OMISDK", "=>> ON IN COMMING CALL => ")
       map.putString("callerNumber", OmiClient.prePhoneNumber)
       map.putBoolean("isVideo", NotificationService.isVideo)
       map.putBoolean("incoming", true)
@@ -119,6 +124,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       map.putString("transactionId", transactionId ?: "")
       map.putInt("status", CallState.early.value)
       map.putBoolean("incoming", false)
+      Log.d("OMISDK", "=>> ON RINGING CALL => ")
     }
     sendEvent(CALL_STATE_CHANGED, map)
   }
@@ -149,6 +155,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   }
 
   override fun onOutgoingStarted(callerId: Int, phoneNumber: String?, isVideo: Boolean?) {
+    Log.d("OMISDK", "=>> ON OUT GOING STARTED CALL => ")
     val map: WritableMap = WritableNativeMap()
     map.putString("callerNumber", "")
     map.putBoolean("isVideo", NotificationService.isVideo)
@@ -369,13 +376,14 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         //  map.putString("status", startCallResult)
          map.putString("_id", "")
           // map.putString("message", startCallResult as String)
-         Log.d("dataOmi", "startCall  ==>> ${map} ")
+      Log.d("OMISDK", "=>> ON START CALL =>  $map")
         promise.resolve(true)
       }
     } else {
       map.putString("status","4")
       map.putString("_id", "")
       map.putString("message", messageCall(4) as String)
+      Log.d("OMISDK", "=>> ON START CALL FAIL BECAUSE NEED PERMISSION =>  $map")
       promise.resolve(false)
     }
   }
@@ -409,28 +417,22 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
   @ReactMethod
   fun joinCall(promise: Promise) {
     currentActivity?.runOnUiThread {
-      OmiClient.getInstance(reactApplicationContext!!).pickUp()
-      promise.resolve(true)
+      if(reactApplicationContext != null) {
+          OmiClient.getInstance(reactApplicationContext!!).pickUp()
+          promise.resolve(true)
+      }
     }
   }
 
   @ReactMethod
   fun endCall(promise: Promise) {
-    currentActivity?.runOnUiThread {
-      val call = OmiClient.getInstance(reactApplicationContext!!).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)
-    }
+    if(isIncomming && !isAnserCall){
+        OmiClient.getInstance(reactApplicationContext!!).decline()
+    } else {
+      OmiClient.getInstance(reactApplicationContext!!).hangUp()
+    }  
+      promise.resolve(true)
+    
   }
 
   @ReactMethod

package/ios/CallProcess/CallManager.swift

@@ -21,7 +21,7 @@ class CallManager {
     private var guestPhone : String = ""
     private var lastStatusCall : String?
     private var tempCallInfo : [String: Any]?
-    
+    private var lastTimeCall : Date = Date()
     /// Get instance
     static func shareInstance() -> CallManager {
         if (instance == nil) {
@@ -79,7 +79,7 @@ class CallManager {
     
     func initWithUserPasswordEndpoint(params: [String: Any]) -> Bool {
         if let userName = params["userName"] as? String, let password = params["password"] as? String, let realm = params["realm"] as? String {
-            OmiClient.initWithUsername(userName, password: password, realm: realm)
+            OmiClient.initWithUsername(userName, password: password, realm: realm, proxy: "")
         }
         let isVideo = (params["isVideo"] as? Bool) ?? true
         requestPermission(isVideo: isVideo)
@@ -309,7 +309,7 @@ class CallManager {
         }
 
         if (callState != OMICallState.disconnected.rawValue) {
-            SwiftOmikitPlugin.instance?.sendEvent(CALL_STATE_CHANGED, dataToSend)
+            OmikitPlugin.instance?.sendEvent(withName: CALL_STATE_CHANGED, body: dataToSend)
         }
        
         switch (callState) {
@@ -319,7 +319,7 @@ class CallManager {
             }
             isSpeaker = call.isVideo
             lastStatusCall = "answered"
-            SwiftOmikitPlugin.instance.sendMuteStatus()
+            OmikitPlugin.instance.sendMuteStatus()
             break
         case OMICallState.incoming.rawValue:
             guestPhone = call.callerNumber ?? ""
@@ -332,10 +332,10 @@ class CallManager {
             lastStatusCall = nil
             guestPhone = ""
             var combinedDictionary: [String: Any] = dataToSend
-            if (tempCallInfo.count > 0) {
-                combinedDictionary.merge(tempCallInfo, uniquingKeysWith: { (_, new) in new })
+            if (tempCallInfo != nil && tempCallInfo?.count ?? 0 > 0) {
+                combinedDictionary.merge(tempCallInfo ?? [:], uniquingKeysWith: { (_, new) in new })
             }
-            SwiftOmikitPlugin.instance?.sendEvent(CALL_STATE_CHANGED, combinedDictionary )
+            OmikitPlugin.instance?.sendEvent(withName: CALL_STATE_CHANGED, body: combinedDictionary )
             lastTimeCall = Date()
             tempCallInfo = [:]
             break
@@ -367,6 +367,7 @@ class CallManager {
     
     /// Start call
     func startCall(_ phoneNumber: String, isVideo: Bool, completion: @escaping (_ : Int) -> Void) {
+        let secondsSinceCurrentTime = lastTimeCall.timeIntervalSinceNow
         guestPhone = phoneNumber
         OmiClient.startCall(phoneNumber, isVideo: isVideo) { status in
             DispatchQueue.main.async {

package/ios/CallProcess/OmiUtils.swift

@@ -0,0 +1,53 @@
+import Foundation
+import AVFoundation
+import SwiftUI
+import OmiKit
+
+public class OmiUtils {
+
+    static private var instance: OmiUtils? = nil // Instance
+
+    static func shareInstance() -> OmiUtils {
+        if (instance == nil) {
+           instance = OmiUtils()
+        }
+        return instance!
+    }
+
+    func convertDictionaryToJson(dictionary: [String: Any]) -> String? {
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: dictionary, options: [])
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                return jsonString
+            }
+        } catch {
+            print("Error converting dictionary to JSON: \(error)")
+        }
+        return nil
+    }
+
+    func messageCall(type: Int) -> String {
+        switch(type){
+            case 0:
+                return "INVALID_UUID"
+            case 1:
+                 return "INVALID_PHONE_NUMBER"
+            case 2:
+                 return "SAME_PHONE_NUMBER_WITH_PHONE_REGISTER"
+            case 3:
+                return "MAX_RETRY"
+            case 4:
+                return "PERMISSION_DENIED"
+            case 5:
+                return "COULD_NOT_FIND_END_POINT"
+            case 6:
+                return "REGISTER_ACCOUNT_FAIL"
+            case 7:
+                return "START_CALL_FAIL"
+            case 9:
+                return "HAVE_ANOTHER_CALL"
+            default:
+                return "START_CALL_SUCCESS"
+        }
+    }
+}

package/ios/Model/OmiCallModel.swift

@@ -0,0 +1,66 @@
+import Foundation
+import OmiKit
+
+struct OmiCallModel: Hashable {
+    var callId: Int
+    var incoming: Bool = false
+    var callState: Int = 0
+    var callerNumber: String
+    var isVideo: Bool = false
+    var omiId: String
+    var uuid: String
+    var callerName: String
+    var muted: Bool = false
+    var speaker: Bool = false
+    var onHold: Bool = false
+    var numberToCall: String
+    var connected: Bool
+    var totalMBsUsed: Double = 0.0
+    var mos: Double = 0.0
+    var latency: Double = 0.0
+    var jitter: Double = 0.0
+    var ppl: Double = 0.0
+
+    init(omiCall: OmiCallModel){
+        self.callId = omiCall.callId
+        self.incoming = omiCall.incoming
+        self.callState = omiCall.callState
+        self.callerNumber = omiCall.callerNumber
+        self.isVideo = omiCall.isVideo
+        self.omiId = omiCall.omiId
+        self.uuid = omiCall.uuid
+        self.callerName = omiCall.callerName
+        self.muted = omiCall.muted
+        self.speaker = omiCall.speaker
+        self.onHold = omiCall.onHold
+        self.numberToCall = omiCall.numberToCall
+        self.connected = omiCall.connected
+        self.totalMBsUsed = omiCall.totalMBsUsed
+        self.mos = omiCall.mos
+        self.latency = omiCall.latency
+        self.jitter = omiCall.jitter
+        self.ppl = omiCall.ppl
+    }
+
+    init(omiCall: OMICall){
+        self.callId = omiCall.callId
+        self.incoming = omiCall.isIncoming
+        self.callState =  omiCall.callState.rawValue ?? 0
+        self.callerNumber = omiCall.callerNumber ?? ""
+        self.isVideo = omiCall.isVideo
+        self.omiId = omiCall.omiId ?? ""
+        self.uuid = omiCall.uuid.uuidString
+        self.callerName = omiCall.callerName ?? ""
+        self.muted = omiCall.muted
+        self.speaker = omiCall.speaker
+        self.onHold = omiCall.onHold
+        self.numberToCall = omiCall.numberToCall
+        self.connected = omiCall.connected
+        self.totalMBsUsed = Double(omiCall.totalMBsUsed)
+        self.mos = Double(omiCall.mos)
+        self.latency = Double(omiCall.latency)
+        self.jitter = Double(omiCall.jitter)
+        self.ppl = Double(omiCall.ppl)
+    }
+
+}

package/ios/Model/StartCalModel.swift

@@ -0,0 +1,17 @@
+
+import Foundation
+import SwiftUI
+
+class StartCalModel {
+    var status: Int = 0
+    var callInfo: OmiCallModel?
+    var message: String?
+
+    init(status: Int, callInfo: OmiCallModel, message:String) {
+        self.status =  status
+        self.callInfo = callInfo
+        self.message = message
+    }
+
+
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omikit-plugin",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "Omikit Plugin by ViHAT",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",