omikit-plugin 3.2.12 → 3.2.15

package/README.md

@@ -340,36 +340,52 @@ We support 2 environments. So you need set correct key in Appdelegate.
 
     startServices();
     ```
+  - 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>
 
-  - Create OmiKit With ApiKey: OmiKit need apikey, username, user id to init enviroment. ViHAT Group will provide api key for you. Please contact for my sale:
+  - Create OmiKit With ApiKey: OmiKit need apikey, username, user id to init environment(All information in innit is required). ViHAT Group will provide api key for you. Please contact for my sale:
     In This step, we need partner provide me  fcmToken of firebase Message.
     ``
     import { initCallWithApiKey } from 'omikit-plugin';
+    import messaging from '@react-native-firebase/messaging';
+    
+    let token: String 
+    if(Platform.OS == "ios"){
+      token = await messaging.getAPNSToken()
+    } else {
+      token = await messaging.getToken()
+    }
 
     const loginInfo = {
       usrUuid: usrUuid,
       fullName: fullName,
       apiKey: apiKey,
       phone: phone,
-      fcmToken: fcmToken,  //string
+      fcmToken: token,  //with android is fcm_token and ios is APNS token
       isVideo: isVideo,
     };
     const result = await initCallWithApiKey(loginInfo);
     //result is true then user login successfully.
     ```
 
-  - Create OmiKit: OmiKit need userName, password, realm, host to init enviroment. ViHAT Group will provide informations for you. Please contact for my sale:
+  - Create OmiKit: OmiKit need userName, password, realm, fcmToken to init environment(All information in innit is required). ViHAT Group will provide information for you. Please contact for my sale:
 
 ```
     import { initCallWithUserPassword } from 'omikit-plugin';
+    import messaging from '@react-native-firebase/messaging';
+    
+    let token: String 
+    if(Platform.OS == "ios"){
+      token = await messaging.getAPNSToken()
+    } else {
+      token = await messaging.getToken()
+    }
 
     const loginInfo = {
       userName: userName, //string
       password: password, //string
       realm: realm, //string
       isVideo: isVideo, //boolean: true/false
-      host: host, //string
-      fcmToken: fcmToken, //string
+      fcmToken: token, //with android is fcm_token and ios is APNS token
     };
     const result = await initCallWithUserPassword(loginInfo);
     //result is true then user login successfully.
@@ -398,21 +414,7 @@ We support 2 environments. So you need set correct key in Appdelegate.
   //incomingAcceptButtonImage, incomingDeclineButtonImage, backImage, userImage: Add these into `android/app/src/main/res/drawble`
   ```
 
-- 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>
 
-  ```
-  import { updateToken } from 'omikit-plugin';
-  const fcmToken = await fcm;
-  const apnsToken = await apns;
-  const deviceId = DeviceInfo.getDeviceId();
-  const appId = DeviceInfo.getBundleId();
-  updateToken({
-    apnsToken: apnsToken,
-    fcmToken: fcmToken,
-    deviceId: deviceId,
-    appId: appId,
-  });
-  ```
 
 - Get call when user open application at first time:
 

package/android/build.gradle

@@ -102,9 +102,9 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   // For < 0.71, this will be from the local maven repo
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
-  //noinspection GradleDynamicVersion
-//   implementation "com.facebook.react:react-native"
-  api 'vn.vihat.omicall:omi-sdk:2.0.64'
+  // noinspection GradleDynamicVersion
+  // implementation "com.facebook.react:react-native"
+  api 'vn.vihat.omicall:omi-sdk:2.0.68'
 
   implementation "com.facebook.react:react-native:+" // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

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

@@ -10,6 +10,7 @@ import android.os.Handler
 import android.os.Looper
 import android.provider.Settings
 import android.util.Log
+import kotlin.concurrent.thread
 import androidx.annotation.RequiresApi
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
@@ -294,11 +295,11 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
         Log.d("dataOmi", "INIT_CALL_USER_PASSWORD  ==>> $userName ")
         val password = data.getString("password")
         val realm = data.getString("realm")
-        val host = data.getString("host")
+        val host = data.getString("host") ?: "vh.omicrm.com"
         val isVideo = data.getBoolean("isVideo")
-          val firebaseToken = data.getString("fcmToken") as String
+        val firebaseToken = data.getString("fcmToken")
 
-          Log.d("dataOmi", "INIT_CALL_USER_PASSWORD $userName -- $password --$realm --$isVideo -- $host")
+        Log.d("dataOmi", "INIT_CALL_USER_PASSWORD $userName -- $password --$realm --$isVideo -- $host")
 
           withContext(Dispatchers.Default) {
               try {
@@ -348,40 +349,33 @@ class OmikitPluginModule(reactContext: ReactApplicationContext?) :
 
 
   @ReactMethod
-  fun getInitialCall(promise: Promise) {
+  fun getInitialCall(counter: Int = 4, promise: Promise) {
     currentActivity?.runOnUiThread {
-      val call = OmiClient.getInstance(reactApplicationContext!!).getCurrentCallInfo()
-      Log.d("getInitialCall RN", "getInitialCall $call")
-      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)
-      }
-    }
-  }
-
-  @ReactMethod
-  fun updateToken(data: ReadableMap, promise: Promise) {
-    mainScope.launch {
-      val deviceTokenAndroid = data.getString("fcmToken") as String
-      withContext(Dispatchers.Default) {
-        try {
-          OmiClient.getInstance(reactApplicationContext!!).updatePushToken(
-            deviceTokenAndroid
-          )
-        } catch (_: Throwable) {
-
+      if (reactApplicationContext != null && OmiClient.getInstance(reactApplicationContext!!) != null) {
+        val call = OmiClient.getInstance(reactApplicationContext!!).getCurrentCallInfo();
+        Log.d("getInitialCall RN", "getInitialCall $call")
+        if (call == null) {
+          if (counter <= 0) {
+            promise.resolve(false);
+          } else {
+            thread {
+              Thread.sleep(5000) // Chờ 5 giây
+              getInitialCall(counter - 1, promise); // Gọi lại hàm đệ quy
+            }
+          }
+        } else {
+          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)
         }
       }
-      promise.resolve(true)
     }
   }
 
+
   @ReactMethod
   fun startCall(data: ReadableMap, promise: Promise) {
     val audio: Int =

package/ios/CallProcess/CallManager.swift

@@ -71,13 +71,7 @@ class CallManager {
        }
    }
     
-    
-    func updateToken(params: [String: Any]) {
-        if let apnsToken = params["apnsToken"] as? String {
-            OmiClient.setUserPushNotificationToken(apnsToken)
-        }
-    }
-    
+     
     func configNotification(data: [String: Any]) {
         let user = UserDefaults.standard
         if let title = data["missedCallTitle"] as? String, let message = data["prefixMissedCallMessage"] as? String {
@@ -137,8 +131,9 @@ class CallManager {
     func initWithApiKeyEndpoint(params: [String: Any]) -> Bool {
         //request permission
         var result = false
-        if let usrUuid = params["usrUuid"] as? String, let fullName = params["fullName"] as? String, let apiKey = params["apiKey"] as? String {
+        if let usrUuid = params["usrUuid"] as? String, let fullName = params["fullName"] as? String, let apiKey = params["apiKey"] as? String, let token = params["fcmToken"] as? String {
             result = OmiClient.initWithUUID(usrUuid, fullName: fullName, apiKey: apiKey)
+            OmiClient.setUserPushNotificationToken(token)
         }
         if (result) {
             let isVideo = (params["isVideo"] as? Bool) ?? true
@@ -149,12 +144,15 @@ 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 {
+        var result = false
+        if let userName = params["userName"] as? String, let password = params["password"] as? String, let realm = params["realm"] as? String, let token = params["fcmToken"] as? String {
             OmiClient.initWithUsername(userName, password: password, realm: realm, proxy: "")
+            OmiClient.setUserPushNotificationToken(token)
+            result = true
         }
         let isVideo = (params["isVideo"] as? Bool) ?? true
         requestPermission(isVideo: isVideo)
-        return true
+        return result
     }
 
     func showMissedCall() {

package/ios/Library/OmikitPlugin.m

@@ -22,9 +22,6 @@ RCT_EXTERN_METHOD(initCallWithApiKey:(id)data
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(updateToken:(id)data
-                 withResolver:(RCTPromiseResolveBlock)resolve
-                 withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(startCall:(id)data
                  withResolver:(RCTPromiseResolveBlock)resolve

package/ios/Library/OmikitPlugin.swift

@@ -57,13 +57,6 @@ public class OmikitPlugin: RCTEventEmitter {
         }
     }
     
-    @objc(updateToken:withResolver:withRejecter:)
-    func updateToken(data: Any, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-        if let dataOmi = data as? [String: Any] {
-            CallManager.shareInstance().updateToken(params: dataOmi)
-            resolve(true)
-        }
-    }
     
     @objc(startCall:withResolver:withRejecter:)
     func startCall(data: Any, resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {

package/lib/commonjs/omikit.js

@@ -31,7 +31,6 @@ exports.toggleMute = toggleMute;
 exports.toggleOmiVideo = toggleOmiVideo;
 exports.toggleSpeaker = toggleSpeaker;
 exports.transferCall = transferCall;
-exports.updateToken = updateToken;
 var _reactNative = require("react-native");
 const LINKING_ERROR = `The package 'omikit-plugin' doesn't seem to be linked. Make sure: \n\n` + _reactNative.Platform.select({
   ios: "- You have run 'pod install'\n",
@@ -49,18 +48,18 @@ function configPushNotification(data) {
   return OmikitPlugin.configPushNotification(data);
 }
 function getInitialCall() {
-  return OmikitPlugin.getInitialCall();
+  if (_reactNative.Platform.OS == "ios") {
+    return OmikitPlugin.getInitialCall();
+  } else {
+    return OmikitPlugin.getInitialCall(4);
+  }
 }
 function initCallWithUserPassword(data) {
-  console.log("data OmikitPlugin: ", data);
   return OmikitPlugin.initCallWithUserPassword(data);
 }
 function initCallWithApiKey(data) {
   return OmikitPlugin.initCallWithApiKey(data);
 }
-function updateToken(data) {
-  return OmikitPlugin.updateToken(data);
-}
 function startCall(data) {
   return OmikitPlugin.startCall(data);
 }

package/lib/commonjs/omikit.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","OmikitPlugin","NativeModules","Proxy","get","Error","startServices","configPushNotification","data","getInitialCall","initCallWithUserPassword","console","log","initCallWithApiKey","updateToken","startCall","startCallWithUuid","joinCall","endCall","toggleMute","toggleSpeaker","onHold","sendDTMF","switchOmiCamera","toggleOmiVideo","logout","registerVideoEvent","removeVideoEvent","getCurrentUser","getGuestUser","systemAlertWindow","openSystemAlertSetting","getAudio","setAudio","getCurrentAudio","transferCall","omiEmitter","NativeEventEmitter","exports","OmiCallEvent","onCallStateChanged","onSpeaker","onMuted","onRemoteVideoReady","onClickMissedCall","onSwitchboardAnswer","onCallQuality","onAudioChange"],"sourceRoot":"../../src","sources":["omikit.tsx"],"mappings":"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"}
+{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","OmikitPlugin","NativeModules","Proxy","get","Error","startServices","configPushNotification","data","getInitialCall","OS","initCallWithUserPassword","initCallWithApiKey","startCall","startCallWithUuid","joinCall","endCall","toggleMute","toggleSpeaker","onHold","sendDTMF","switchOmiCamera","toggleOmiVideo","logout","registerVideoEvent","removeVideoEvent","getCurrentUser","getGuestUser","systemAlertWindow","openSystemAlertSetting","getAudio","setAudio","getCurrentAudio","transferCall","omiEmitter","NativeEventEmitter","exports","OmiCallEvent","onCallStateChanged","onSpeaker","onMuted","onRemoteVideoReady","onClickMissedCall","onSwitchboardAnswer","onCallQuality","onAudioChange"],"sourceRoot":"../../src","sources":["omikit.tsx"],"mappings":"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"}

package/lib/module/omikit.js

@@ -15,18 +15,18 @@ export function configPushNotification(data) {
   return OmikitPlugin.configPushNotification(data);
 }
 export function getInitialCall() {
-  return OmikitPlugin.getInitialCall();
+  if (Platform.OS == "ios") {
+    return OmikitPlugin.getInitialCall();
+  } else {
+    return OmikitPlugin.getInitialCall(4);
+  }
 }
 export function initCallWithUserPassword(data) {
-  console.log("data OmikitPlugin: ", data);
   return OmikitPlugin.initCallWithUserPassword(data);
 }
 export function initCallWithApiKey(data) {
   return OmikitPlugin.initCallWithApiKey(data);
 }
-export function updateToken(data) {
-  return OmikitPlugin.updateToken(data);
-}
 export function startCall(data) {
   return OmikitPlugin.startCall(data);
 }

package/lib/module/omikit.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","Platform","NativeEventEmitter","LINKING_ERROR","select","ios","default","OmikitPlugin","Proxy","get","Error","startServices","configPushNotification","data","getInitialCall","initCallWithUserPassword","console","log","initCallWithApiKey","updateToken","startCall","startCallWithUuid","joinCall","endCall","toggleMute","toggleSpeaker","onHold","sendDTMF","switchOmiCamera","toggleOmiVideo","logout","registerVideoEvent","removeVideoEvent","getCurrentUser","getGuestUser","systemAlertWindow","openSystemAlertSetting","getAudio","setAudio","getCurrentAudio","transferCall","omiEmitter","OmiCallEvent","onCallStateChanged","onSpeaker","onMuted","onRemoteVideoReady","onClickMissedCall","onSwitchboardAnswer","onCallQuality","onAudioChange"],"sourceRoot":"../../src","sources":["omikit.tsx"],"mappings":"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"}
+{"version":3,"names":["NativeModules","Platform","NativeEventEmitter","LINKING_ERROR","select","ios","default","OmikitPlugin","Proxy","get","Error","startServices","configPushNotification","data","getInitialCall","OS","initCallWithUserPassword","initCallWithApiKey","startCall","startCallWithUuid","joinCall","endCall","toggleMute","toggleSpeaker","onHold","sendDTMF","switchOmiCamera","toggleOmiVideo","logout","registerVideoEvent","removeVideoEvent","getCurrentUser","getGuestUser","systemAlertWindow","openSystemAlertSetting","getAudio","setAudio","getCurrentAudio","transferCall","omiEmitter","OmiCallEvent","onCallStateChanged","onSpeaker","onMuted","onRemoteVideoReady","onClickMissedCall","onSwitchboardAnswer","onCallQuality","onAudioChange"],"sourceRoot":"../../src","sources":["omikit.tsx"],"mappings":"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"}

package/package.json

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

package/src/omikit.tsx

@@ -26,11 +26,14 @@ export function configPushNotification(data: any): Promise<any> {
 }
 
 export function getInitialCall(): Promise<any> {
+  if(Platform.OS == "ios"){
   return OmikitPlugin.getInitialCall();
+  } else {
+    return OmikitPlugin.getInitialCall(4);
+  }
 }
 
 export function initCallWithUserPassword(data: any): Promise<boolean> {
-    console.log("data OmikitPlugin: ", data)
   return OmikitPlugin.initCallWithUserPassword(data);
 }
 
@@ -38,9 +41,6 @@ export function initCallWithApiKey(data: any): Promise<boolean> {
   return OmikitPlugin.initCallWithApiKey(data);
 }
 
-export function updateToken(data: any): Promise<void> {
-  return OmikitPlugin.updateToken(data);
-}
 
 export function startCall(data: any): Promise<boolean> {
   return OmikitPlugin.startCall(data);