capacitor-plugin-vonage 0.1.5 → 0.1.6

package/android/src/main/java/com/managemyhealth/plugin/vonage/VideoCallActivity.java

@@ -50,6 +50,7 @@ import javax.annotation.Nullable;
 import pub.devrel.easypermissions.EasyPermissions;
 public class VideoCallActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks, Application.ActivityLifecycleCallbacks {
     private static final String TAG = VideoCallActivity.class.getSimpleName();
+    private static Toast GlobalToast;
     public Session session;
     private static Bridge staticBridge = null;
     private  String dummyProfile = "https://www.gravatar.com/avatar/?d=mp";
@@ -84,6 +85,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     public static Button admit;
     public static Button deny ;
     Boolean ISPROVIDER = false;
+    Boolean iscircleAvatarVisible = false;
+    Boolean onVideoDataReceived = false;
     Boolean isAppinBackground = false;
     private TextView timerTextView;
     private long startTime = 0;
@@ -173,6 +176,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                     ProviderViewLayout.setVisibility(View.VISIBLE);
                 }
                 circleAvatar.setVisibility(View.GONE); // Hide the view
+                iscircleAvatarVisible=false;
                 patientStatus.setVisibility(View.GONE); // Hide the view
                 publishernameView.setVisibility(View.GONE);// Hide the view
                 admit.setVisibility(View.GONE);
@@ -200,6 +204,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                     ProviderViewLayout.setVisibility(View.VISIBLE);
                 }
                 circleAvatar.setVisibility(View.GONE); // Hide the view
+                iscircleAvatarVisible=false;
+
                 patientStatus.setVisibility(View.GONE); // Hide the view
                 publishernameView.setVisibility(View.GONE);// Hide the view
                 admit.setVisibility(View.GONE);
@@ -230,27 +236,33 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
             }
             else if( stream.getStreamVideoType()==Stream.StreamVideoType.StreamVideoTypeCamera) {
-                circleAvatar.setVisibility(View.VISIBLE); // Show the view
-                publishernameView.setVisibility(View.VISIBLE);
+
                 if (!ISPROVIDER) {
-                    if (session != null) {
-                        session.disconnect();
-                    }
-                    if (subscriber != null) {
-                        subscriber = null;
-                        subscriberViewContainer.removeAllViews();
-                        Intent resultIntent = new Intent();
-                        String resultcode = ISPROVIDER ? "999" : "888";
-                        resultIntent.putExtra("result_key", resultcode);
-                        setResult(RESULT_OK, resultIntent);
-                        finish();
-                    }
+//                    if(streamCount==1){
+                        circleAvatar.setVisibility(View.VISIBLE); // Show the view
+                        iscircleAvatarVisible=true;
+                        publishernameView.setVisibility(View.VISIBLE);
+                        if (session != null) {
+                            session.disconnect();
+                        }
+                        if (subscriber != null) {
+                            subscriber = null;
+                            subscriberViewContainer.removeAllViews();
+                            Intent resultIntent = new Intent();
+                            String resultcode = ISPROVIDER ? "999" : "888";
+                            resultIntent.putExtra("result_key", resultcode);
+                            setResult(RESULT_OK, resultIntent);
+                            finish();
+                        }
+//                    }
                 } else {
-                    if (subscriber != null) {
-                        subscriber = null;
-                        subscriberViewContainer.removeAllViews();
-                        showToast(SUBSCRIBERNAME + " left the call");
-                    }
+//                    if(streamCount==1){
+                        if (subscriber != null) {
+                            subscriber = null;
+                            subscriberViewContainer.removeAllViews();
+                            showToast(SUBSCRIBERNAME + " left the call");
+                        }
+//                    }
                 }
             }
         }
@@ -271,16 +283,27 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     };
     SubscriberKit.VideoListener videoListener = new  SubscriberKit.VideoListener() {
         @Override
-        public void onVideoDataReceived(SubscriberKit subscriberKit) {}
+        public void onVideoDataReceived(SubscriberKit subscriberKit) {
+            onVideoDataReceived=true;
+        }
         @Override
         public void onVideoDisabled(SubscriberKit subscriberKit, String s) {
+
+            onVideoDataReceived=false;
             showToast(SUBSCRIBERNAME + " video disabled");
             circleAvatar.setVisibility(View.VISIBLE); // Show the view
+            iscircleAvatarVisible=true;
+
         }
         @Override
         public void onVideoEnabled(SubscriberKit subscriberKit, String s) {
-            showToast(SUBSCRIBERNAME + " video enabled");
-            circleAvatar.setVisibility(View.GONE); // Hide the view
+            Log.d("onVideoEnabled",s);
+            if(s == "publishVideo"){
+                showToast(SUBSCRIBERNAME + " video enabled");
+                circleAvatar.setVisibility(View.GONE); // Hide the view
+                iscircleAvatarVisible = false;
+            }
+
         }
         @Override
         public void onVideoDisableWarning(SubscriberKit subscriberKit) {}
@@ -564,6 +587,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 //        if(instance.ISPROVIDER){
             Log.d("patientStatuISPROVIDER", String.valueOf(isOnline));
 
+        if(subscriber==null){
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
@@ -592,17 +616,22 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
                 }
             });
+        }
 //        }
     }
     public static void showGreenToast(Context context, String message) {
+        if(GlobalToast!=null){
+            GlobalToast.cancel();
+        }
         LayoutInflater inflater = LayoutInflater.from(context);
         View layout = inflater.inflate(R.layout.custom_toast_green_layout, null);
+
         TextView text = layout.findViewById(R.id.toastView);
         text.setText(message);
         Toast toast = new Toast(context);
         toast.setDuration(Toast.LENGTH_SHORT);
         toast.setView(layout);
-        toast.setGravity(Gravity.TOP | Gravity.END, 0, 0);
+        toast.setGravity(Gravity.TOP | Gravity.END, 0, 10);
         int desiredWidth = isTablet(context) ? getScreenWidth(context) - dpToPx(context, 250) :
                 getScreenWidth(context) - dpToPx(context, 100);
 
@@ -611,6 +640,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         ViewGroup.LayoutParams params = new LinearLayout.LayoutParams(desiredWidth, ViewGroup.LayoutParams.WRAP_CONTENT);
         layout.setLayoutParams(params);
         toast.show();
+        GlobalToast =toast;
     }
     private static boolean isTablet(Context context) {
         return (context.getResources().getConfiguration().screenLayout &

package/android/src/main/res/drawable/circle_toast.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <solid android:color="#0B6623" />
+    <corners
+        android:bottomLeftRadius="20dp"
+        android:bottomRightRadius="20dp"
+        android:topLeftRadius="20dp"
+        android:topRightRadius="20dp" />
+</shape>

package/ios/Plugin/VideoChatViewController.swift

@@ -26,11 +26,21 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     var isPatientFromWeb = true
     var videoCallParam = String()
     var profilePicApiUrl = ""
-    var session: OTSession?
-    var publisher: OTPublisher?
+   // var session: OTSession?
+    //var publisher: OTPublisher?
     var subscriber: OTSubscriber?
     var screenTypesubscriber: OTSubscriber?
     
+    lazy var session: OTSession = {
+        return OTSession(apiKey: kApiKey, sessionId: kSessionId, delegate: self)!
+    }()
+    lazy var publisher: OTPublisher = {
+        let settings = OTPublisherSettings()
+        settings.name = UIDevice.current.name
+        return OTPublisher(delegate: self, settings: settings)!
+    }()
+    var error: OTError?
+    
     var bottomView = UIView()
     var remoteView = UIView()
     var localView = UIView()
@@ -61,6 +71,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         NotificationCenter.default.addObserver(self, selector: #selector(appMovedToForeground), name: UIApplication.willEnterForegroundNotification, object: nil)
         showActivityIndicator()
         UserDefaults.standard.set(isProvider, forKey: "isProvider")
+        self.connectToAnOpenTokSession()
         self.viewSetupMethod()
         // let jsonParam = videoCallParam.toJSON() as? [String:AnyObject] // can be any type here
         // print(jsonParam as Any)
@@ -98,7 +109,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
             //                        NSLog("Unable to change preferred sample rate because : \(String(describing: err?.localizedDescription))")
             //                        err = nil
             //                    }
-            self.connectToAnOpenTokSession()
+            
        // })
     }
     override func viewDidAppear(_ animated: Bool) {
@@ -223,7 +234,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         
         remoteView = UIView(frame: CGRect(x: 0, y: 0, width: screenWidth, height:screenHeight))
         remoteView.backgroundColor = .white//UIColor(red: 83/255, green: 83/255, blue: 83/255, alpha: 1.0)
-        centerView.layer.zPosition = 1
+        centerView.layer.zPosition = 3
         centerView.frame = CGRect(x: 0, y: 0, width: 250, height: 400)
         // centerView.backgroundColor = .blue
         centerView.center.x = remoteView.center.x
@@ -284,6 +295,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         adminBtn.layer.borderColor = UIColor(hex: "#60D2A7").cgColor
         adminBtn.layer.borderWidth = 2
         adminBtn.layer.cornerRadius = 10
+        adminBtn.layer.zPosition = 3
         adminBtn.setTitleColor(UIColor(hex: "#000000"), for: .normal)
         adminBtn.setTitle("ADMIT", for: .normal)
         adminBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: dynamicFontSize(UIDevice.current.userInterfaceIdiom == .pad ? 10 : 15))
@@ -295,6 +307,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         sendNotificationBtn.layer.borderColor = UIColor(hex: "#60D2A7").cgColor
         sendNotificationBtn.layer.borderWidth = 2
         sendNotificationBtn.layer.cornerRadius = 10
+        sendNotificationBtn.layer.zPosition = 3
         sendNotificationBtn.setTitleColor(UIColor(hex: "#000000"), for: .normal)
         sendNotificationBtn.setTitle(isPatientFromWeb ? "SEND EMAIL NOTIFICATION" : "SEND NOTIFICATION", for: .normal)
         sendNotificationBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: dynamicFontSize(UIDevice.current.userInterfaceIdiom == .pad ? 7 : 15))
@@ -306,6 +319,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         denyBtn.layer.borderColor = UIColor(hex: "#C4CBCF").cgColor
         denyBtn.layer.borderWidth = 2
         denyBtn.layer.cornerRadius = 10
+        denyBtn.layer.zPosition = 3
         denyBtn.setTitleColor(UIColor(hex: "#000000"), for: .normal)
         denyBtn.setTitle("DENY", for: .normal)
         denyBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: dynamicFontSize(UIDevice.current.userInterfaceIdiom == .pad ? 10 : 15))
@@ -322,7 +336,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         centerView.isHidden = true
        
        // subscriberImg = UIImageView(image: <#T##UIImage?#>)
-        remoteView.addSubview(centerView)
+        //remoteView.addSubview(centerView)
         remoteView.addSubview(timerLabel)
         remoteView.addSubview(subscriberLabel)
         
@@ -333,7 +347,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         bottomView.center = CGPoint(x: self.view.frame.size.width / 2, y: self.view.frame.size.height - 50)
         
         self.view.addSubview(bottomView)
-        
+        self.view.addSubview(centerView)
         localView = UIView(frame: CGRect(x: screenWidth - 140, y: screenHeight - 260, width: 120, height: 120))
         localView.backgroundColor = UIColor(red: 31/255, green: 33/255, blue: 36/255, alpha: 1.0)
         localView.layer.borderColor = UIColor(hex: "#9b9c98").cgColor
@@ -421,7 +435,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         let userInfo = ["isProvider": isProvider]
 //        NotificationCenter.default.post(name: NSNotification.Name("SendNotification"),object: nil,userInfo: userInfo)
         delegate?.videoCallSendNotification(userInfo)
-//        self.session?.disconnect(nil)
+//        self.session.disconnect(nil)
 //        self.stopTimer()
 //        self.dismiss(animated: true, completion: nil)
     }
@@ -437,7 +451,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         //subscriberStatusLabel.frame.width =
 //        let userInfo = ["userInfo": ["isProvider": isProvider]]
 //        NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
-//        self.session?.disconnect(nil)
+//        self.session.disconnect(nil)
 //        self.stopTimer()
 //        self.dismiss(animated: true, completion: nil)
         let userInfo = ["isProvider": isProvider]
@@ -475,11 +489,11 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         print("A stream was destroyed in the session.")
         if (self.isBackCameraFace) {
             print("A stream was destroyed in the session.1")
-            self.publisher?.cameraPosition = .front
+            self.publisher.cameraPosition = .front
             self.isBackCameraFace = false
         } else {
             print("A stream was destroyed in the session.2")
-            self.publisher?.cameraPosition = .back
+            self.publisher.cameraPosition = .back
             self.isBackCameraFace = true
         }
     }
@@ -489,11 +503,11 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     }
     func turnOnAndOffVideo(){
         if (self.isVideoMute) {
-            self.publisher?.publishVideo = true
+            self.publisher.publishVideo = true
             self.videoBtn.setImage(UIImage(named : "cameraOnWhite"), for: .normal)
             self.isVideoMute = false
         } else {
-            self.publisher?.publishVideo = false
+            self.publisher.publishVideo = false
             self.videoBtn.setImage(UIImage(named:"cameraOff"), for: .normal)
             self.isVideoMute = true
         }
@@ -502,22 +516,22 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     @objc func audioBtnbuttonClicked() {
         if (self.isAudioMute) {
             
-            self.publisher?.publishAudio = true
+            self.publisher.publishAudio = true
             //self.publisher.del
             self.audioBtn.setImage(UIImage(named : "microphoneOnWhite"), for: .normal)
             self.isAudioMute = false
         } else {
-            self.publisher?.publishAudio = false
+            self.publisher.publishAudio = false
             self.audioBtn.setImage(UIImage(named:"microphoneOff"), for: .normal)
             self.isAudioMute = true
         }
     }
     
     func connectToAnOpenTokSession() {
-        session = OTSession(apiKey: kApiKey, sessionId: kSessionId, delegate: self)
+        //session = OTSession(apiKey: kApiKey, sessionId: kSessionId, delegate: self)
         //self.session = session
         var error: OTError?
-        session?.connect(withToken: kToken, error: &error)
+        session.connect(withToken: kToken, error: &error)
         if error != nil {
             print(error!)
         }
@@ -565,7 +579,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     
     func sessionDidDisconnect(_ session: OTSession) {
         print("The client disconnected from the OpenTok session.")
-       // self.session?.disconnect(nil)
+       // self.session.disconnect(nil)
 //        if(!isCallEnded){
 //            let userInfo = ["userInfo": ["isProvider": self.isProvider]]
 //           // NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
@@ -575,6 +589,22 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     }
     
     func session(_ session: OTSession, didFailWithError error: OTError) {
+        hideActivityIndicator()
+        let alert = UIAlertController(title: "Error", message: "The client failed to connect to the OpenTok session", preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { action in
+            switch action.style{
+                case .default:
+                print("default")
+                
+                case .cancel:
+                print("cancel")
+                
+                case .destructive:
+                print("destructive")
+                
+            }
+        }))
+        self.present(alert, animated: true, completion: nil)
         print("The client failed to connect to the OpenTok session: \(error).")
     }
     
@@ -613,8 +643,8 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         print("A stream was destroyed in the session.\(session.sessionId)")
         //        var error = OTError()
         //        let progressPointer = AutoreleasingUnsafeMutablePointer<OTError?>.init(&error)
-//        if(session.sessionId == self.session?.sessionId){
-//            self.session?.disconnect(nil)
+//        if(session.sessionId == self.session.sessionId){
+//            self.session.disconnect(nil)
 //            self.dismiss(animated: true, completion: nil)
 //        }
         if let subStream = subscriber?.stream, subStream.streamId == stream.streamId,!isProvider, stream.videoType != .screen {
@@ -725,14 +755,14 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
        // NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
        // DispatchQueue.main.async {
             print("video ended called")
-//            self.publisher?.publishVideo = false
-//            self.publisher?.videoCapture?.stop()
-//            self.publisher?.publishAudio = false
+//            self.publisher.publishVideo = false
+//            self.publisher.videoCapture?.stop()
+//            self.publisher.publishAudio = false
             
            // self.cleanupSubscriber()
             //self.cleanupPublisher()
         var error: OTError?
-        self.session?.disconnect(&error)
+        self.session.disconnect(&error)
         if error != nil {
             print(error!)
         }
@@ -745,13 +775,13 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         timerLabel.textColor = .black
         publisherLabel.textColor = .black
            subscriber?.view?.removeFromSuperview()
-           subscriber = nil
+           //subscriber = nil
         remoteView.backgroundColor = .white
        }
        
        fileprivate func cleanupPublisher() {
-           publisher?.view?.removeFromSuperview()
-           publisher = nil
+           publisher.view?.removeFromSuperview()
+           //publisher = nil
        }
     func someImageViewConstraints() {
         subscriberImg.widthAnchor.constraint(equalToConstant: 180).isActive = true
@@ -822,12 +852,13 @@ func showToast(message : String) {
         toastLabel.textColor = .white//UIColor.black
         toastLabel.font = .systemFont(ofSize: 14.0)
         toastLabel.textAlignment = .center;
+        toastLabel.baselineAdjustment = .alignCenters
         toastLabel.text = message
         toastLabel.alpha = 1.0
         toastLabel.layer.cornerRadius = 10;
         toastLabel.clipsToBounds  =  true
         self.view.addSubview(toastLabel)
-        UIView.animate(withDuration: 5.0, delay: 0.2, options: .curveEaseOut, animations: {
+        UIView.animate(withDuration: 4.0, delay: 0.2, options: .curveEaseOut, animations: {
             toastLabel.alpha = 0.0
         }, completion: {(isCompleted) in
             toastLabel.removeFromSuperview()

package/ios/Plugin/vonagePlugin.swift

@@ -12,9 +12,6 @@ public class vonagePlugin: CAPPlugin,VonageSDKInteractionDelegate {
         let sessionId = call.getString("sessionId") ?? ""
         let apiKey = call.getString("apiKey") ?? ""
         let token = call.getString("token") ?? ""
-        print("token: \(token)")
-        print("apiKey: \(apiKey)")
-        print("sessionId: \(sessionId)")
         let publisherName = call.getString("publisherName") ?? ""
         let subscriberName = call.getString("subscriberName") ?? ""
         let isProvider = call.getBool("isProvider") ?? false //profilePicApiUrl

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-plugin-vonage",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "opentok sdk capacitor plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",