omikit-plugin 2.4.0 → 3.0.1

package/README.md

@@ -36,10 +36,13 @@ yarn add omikit-plugin --latest
 ```
 jcenter()
 maven {
-    url("https://vihatgroup.jfrog.io/artifactory/omi-voice/")
-    credentials {
-        username = "downloader"
-        password = "Omi@2022"
+    url "https://gitlab.com/api/v4/projects/47675059/packages/maven"
+    credentials(HttpHeaderCredentials) {
+        name = "Private-Token"
+        value = "glpat-AzyyrvKz9_pjsgGW4xfp"
+    }
+    authentication {
+        header(HttpHeaderAuthentication)
     }
 }
 ```
@@ -71,11 +74,14 @@ allprojects {
         google()
         maven { url 'https://www.jitpack.io' }
         maven {
-          url("https://vihatgroup.jfrog.io/artifactory/omi-voice/")
-          credentials {
-            username = "downloader"
-            password = "Omi@2022"
-          }
+            url "https://gitlab.com/api/v4/projects/47675059/packages/maven"
+            credentials(HttpHeaderCredentials) {
+                name = "Private-Token"
+                value = "glpat-AzyyrvKz9_pjsgGW4xfp"
+            }
+            authentication {
+                header(HttpHeaderAuthentication)
+            }
         }
       }
 }
@@ -96,21 +102,26 @@ You can refer <a href="https://github.com/VIHATTeam/OMICALL-React-Native-SDK/blo
 
 ```
 //need request this permission
+//need request this permission
 <uses-permission android:name="android.permission.INTERNET" />
-//add this lines inside <activity>
+//add these lines inside <activity>
 <intent-filter>
     <action android:name="com.omicall.sdk.CallingActivity"/>
     <category android:name="android.intent.category.DEFAULT" />
 </intent-filter>
-//add this lines outside <activity>
+//add these lines outside <activity>
 <receiver
-  android:name="vn.vihat.omicall.omisdk.receiver.FirebaseMessageReceiver"
-  android:exported="true"
-  android:permission="com.google.android.c2dm.permission.SEND">
-  <intent-filter>
-    <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-  </intent-filter>
+    android:name="vn.vihat.omicall.omisdk.receiver.FirebaseMessageReceiver"
+    android:exported="true"
+    android:permission="com.google.android.c2dm.permission.SEND">
+    <intent-filter>
+        <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+    </intent-filter>
 </receiver>
+<service
+    android:name="vn.vihat.omicall.omisdk.service.NotificationService"
+    android:exported="false">
+</service>
 ```
 
 You can refer <a href="https://github.com/VIHATTeam/OMICALL-React-Native-SDK/blob/main/example/android/app/src/main/AndroidManifest.xml">AndroidManifest</a> to know more informations.
@@ -130,7 +141,6 @@ You can refer <a href="https://github.com/VIHATTeam/OMICALL-React-Native-SDK/blo
 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-<uses-permission android:name="android.permission.WAKE_LOCK"/>
 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
@@ -139,12 +149,14 @@ You can refer <a href="https://github.com/VIHATTeam/OMICALL-React-Native-SDK/blo
 - Setup remote push notification: Only support Firebase for remote push notification.
 
   - Add `google-service.json` in `android/app` (For more information, you can refer <a href="https://rnfirebase.io/app/usage">Core/App</a>)
-  - Add Fire Messaging to receive `fcm_token` (You can refer <a href="https://rnfirebase.io/messaging/usage">Cloud Messaging</a> to setup notification for React native)
+  - Add Firebase Messaging to receive `fcm_token` (You can refer <a href="https://rnfirebase.io/messaging/usage">Cloud Messaging</a> to setup notification for React native)
 
   - For more setting information, please refer <a href="https://api.omicall.com/web-sdk/mobile-sdk/android-sdk/cau-hinh-push-notification">Config Push for Android</a>
 
 #### iOS(Object-C):
 
+- Assets: Add `call_image` into assets folder to update callkit image. We only support png style.
+
 - Add variables in Appdelegate.h:
 
 ```
@@ -169,7 +181,7 @@ You can refer <a href="https://github.com/VIHATTeam/OMICALL-React-Native-SDK/blo
 #import <OmiKit/OmiKit.h>
 #import <omicall_flutter_plugin/omicall_flutter_plugin-Swift.h>
 
-[OmiClient setEnviroment:KEY_OMI_APP_ENVIROMENT_SANDBOX];
+[OmiClient setEnviroment:KEY_OMI_APP_ENVIROMENT_SANDBOX userNameKey:@"full_name" maxCall:2 callKitImage:@"call_image"];
 provider = [[CallKitProviderDelegate alloc] initWithCallManager: [OMISIPLib sharedInstance].callManager];
 voipRegistry = [[PKPushRegistry alloc] initWithQueue:dispatch_get_main_queue()];
 pushkitManager = [[PushKitManager alloc] initWithVoipRegistry:voipRegistry];
@@ -234,7 +246,16 @@ if (@available(iOS 10.0, *)) {
 
   - For more setting information, please refer <a href="https://api.omicall.com/web-sdk/mobile-sdk/ios-sdk/cau-hinh-push-notification">Config Push for iOS</a>
   
+*** Important release note ***
+```
+We support 2 environments. So you need set correct key in Appdelegate.
+- KEY_OMI_APP_ENVIROMENT_SANDBOX support on debug mode
+- KEY_OMI_APP_ENVIROMENT_PRODUCTION support on release mode
+- Visit on web admin to select correct enviroment.   
+```
+  
 #### iOS(Swift):
+- Assets: Add `call_image` into assets folder to update callkit image. We only support png style.
 
 - Add variables in Appdelegate.swift:
 
@@ -251,7 +272,7 @@ var voipRegistry: PKPushRegistry?
 - Add these lines into `didFinishLaunchingWithOptions`:
 
 ```
-OmiClient.setEnviroment(KEY_OMI_APP_ENVIROMENT_SANDBOX)
+OmiClient.setEnviroment(KEY_OMI_APP_ENVIROMENT_SANDBOX, userNameKey: "extension", maxCall: 1, callKitImage: "call_image")
 provider = CallKitProviderDelegate.init(callManager: OMISIPLib.sharedInstance().callManager)
 voipRegistry = PKPushRegistry.init(queue: .main)
 pushkitManager = PushKitManager.init(voipRegistry: voipRegistry)
@@ -290,6 +311,13 @@ extension Data {
   - Add Firebase Messaging to receive `fcm_token` (You can refer <a href="https://pub.dev/packages/firebase_messaging">Cloud Messaging</a> to setup notification for React Native)
 
   - For more setting information, please refer <a href="https://api.omicall.com/web-sdk/mobile-sdk/ios-sdk/cau-hinh-push-notification">Config Push for iOS</a>
+*** Important release note ***
+```
+We support 2 environments. So you need set correct key in Appdelegate.
+- KEY_OMI_APP_ENVIROMENT_SANDBOX support on debug mode
+- KEY_OMI_APP_ENVIROMENT_PRODUCTION support on release mode
+- Visit on web admin to select correct enviroment.   
+```
 
 
 ## Implement
@@ -322,9 +350,9 @@ extension Data {
       usrUuid: usrUuid,
       fullName: fullName,
       apiKey: apiKey,
+      phone: phone,
       isVideo: isVideo,
     };
-    console.log(loginInfo);
     const result = await initCallWithApiKey(loginInfo);
     //result is true then user login successfully.
     ```
@@ -362,22 +390,12 @@ extension Data {
     missedCallTitle: 'Cuộc gọi nhỡ', //config title for the missed call
     userNameKey: 'uuid', //we have 3 values: uuid, full_name, extension.
     channelId: 'com.channel.sample', //your notification channel id
+    audioNotificationDescription: '' //audio description
+    videoNotificationDescription: '' //video descriptipn
   });
   //incomingAcceptButtonImage, incomingDeclineButtonImage, backImage, userImage: Add these into `android/app/src/main/res/drawble`
   ```
 
-- Get call when user open app from killed state(only iOS):
-
-  ```
-  import { getInitialCall } from 'omikit-plugin';
-
-  const callingInfo = await getInitialCall();
-  if (callingInfo !== false) {
-    navigation.navigate('DialCall' as never, callingInfo as never);
-  }
-  //callingInfo != false then user have a calling.
-  ```
-
 - Upload token: OmiKit need FCM for Android and APNS to push notification on user devices. We use more packages: <a href="https://rnfirebase.io/messaging/usage">Cloud Messaging</a> and <a href="https://www.npmjs.com/package/react-native-device-info?activeTab=readme">react-native-device-info</a>
 
   ```
@@ -394,6 +412,18 @@ extension Data {
   });
   ```
 
+- Get call when user open application at first time:
+
+  ```
+  import { getInitialCall } from 'omikit-plugin';
+
+  const callingInfo = await getInitialCall();
+  if (callingInfo !== false) {
+    navigation.navigate('DialCall' as never, callingInfo as never);
+  }
+  //callingInfo != false then user have a calling.
+  ```
+
 - Other functions:
 
   - Call with phone number (mobile phone or internal number):
@@ -404,6 +434,17 @@ extension Data {
       phoneNumber: phone, //phone number
       isVideo: false //allow video call: true/false
   });
+  //we will return OmiStartCallStatus with:
+    - invalidUuid: uuid is invalid (we can not find on my page)
+    - invalidPhoneNumber: sip user is invalid.
+    - samePhoneNumber: Can not call same phone number.
+    - maxRetry: We try to refresh call but we can not start your call.
+    - permissionDenied: Check audio permission.
+    - couldNotFindEndpoint: Please login before make your call.
+    - accountRegisterFailed: We can not register your account.
+    - startCallFailed: We can not start you call.
+    - startCallSuccess: Start call successfully.
+    - haveAnotherCall: We can not start you call because you are joining another call.
   ```
 
   - Call with UUID (only support with Api key):
@@ -414,6 +455,7 @@ extension Data {
       usrUuid: uuid, //phone number
       isVideo: false //allow video call: true/false
   });
+  // Result is the same with startCall
   ```
 
   - Accept a call:
@@ -505,7 +547,7 @@ extension Data {
     }
     ```
 
-  - Logout: Can't receive call.
+  - Logout: logout and remove all information.
 
     ```
     import {logout} from 'omikit-plugin';

package/android/build.gradle

@@ -79,11 +79,14 @@ allprojects {
     mavenCentral()
     jcenter() // Warning: this repository is going to shut down soon
     maven {
-      url("https://vihatgroup.jfrog.io/artifactory/omi-voice/")
-      credentials {
-        username = "downloader"
-        password = "Omi@2022"
-      }
+        url "https://gitlab.com/api/v4/projects/47675059/packages/maven"
+        credentials(HttpHeaderCredentials) {
+            name = "Private-Token"
+            value = "glpat-AzyyrvKz9_pjsgGW4xfp"
+        }
+        authentication {
+            header(HttpHeaderAuthentication)
+        }
     }
   }
 }
@@ -99,7 +102,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  api 'vn.vihat.omicall:omi-sdk:1.4.2'
+  api 'vn.vihat.omicall:omi-sdk:1.4.49'
 //    implementation fileTree(include: ['*.jar'], dir: 'libs')
 //    implementation files('OmiSDK.aar')
   implementation 'androidx.appcompat:appcompat:1.5.0'

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

@@ -12,7 +12,6 @@ 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.*
@@ -28,6 +27,7 @@ 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
 
 
@@ -39,7 +39,7 @@ 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)
@@ -54,6 +54,17 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     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()
@@ -114,11 +125,11 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     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", "")
+    map.putString("transactionId", transactionId ?: "")
     map.putInt("status", CallState.early.value)
     sendEvent(CALL_STATE_CHANGED, map)
   }
@@ -136,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
     }
   }
 
@@ -146,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)
     }
   }
 
@@ -170,6 +179,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       Uri.parse("package:" + reactApplicationContext.packageName))
     intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
     reactApplicationContext.startActivity(intent)
+    promise.resolve(true)
   }
 
   @ReactMethod
@@ -185,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ừ: ",
@@ -194,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)
     }
@@ -232,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) {
@@ -239,7 +256,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
               apiKey = apiKey,
               userName = usrName,
               uuid = usrUuid,
-              isVideo,
+              phone = phone ?: "",
+              isVideo = isVideo,
             )
           }
         } catch (_: Throwable) {
@@ -255,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)
+      }
     }
   }
 
@@ -305,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
@@ -335,8 +363,8 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
     currentActivity?.runOnUiThread {
       val call = OmiClient.instance.hangUp()
       val map: WritableMap = WritableNativeMap()
-      val timeStartToAnswer = call["time_start_to_answer"] as Long?
-      val timeEnd = call["time_end"] as Long
+      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)
@@ -345,7 +373,7 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
       map.putDouble("time_end", timeEnd.toDouble())
       map.putString("sip_user", call["sip_user"] as String)
       map.putString("disposition", call["disposition"] as String)
-      sendEvent(CALL_STATE_CHANGED, map)
+      promise.resolve(map)
     }
   }
 
@@ -408,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 {
@@ -524,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() {

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

@@ -33,3 +33,4 @@ 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"