capacitor-plugin-vonage 0.0.5 → 0.0.7

package/ios/Plugin/VideoChatViewController.swift

@@ -49,6 +49,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     var subscriberImg = UIImageView()
     var counter = 0
     var timer = Timer()
+    var activityView: UIActivityIndicatorView?
     override func viewDidLoad() {
         
         super.viewDidLoad()
@@ -56,6 +57,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         self.view.backgroundColor = .white
         NotificationCenter.default.addObserver(self, selector: #selector(appMovedToBackground), name: UIApplication.willResignActiveNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(appMovedToForeground), name: UIApplication.willEnterForegroundNotification, object: nil)
+        showActivityIndicator()
         self.viewSetupMethod()
         // let jsonParam = videoCallParam.toJSON() as? [String:AnyObject] // can be any type here
         // print(jsonParam as Any)
@@ -113,13 +115,28 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
 //        }
        // turnOnAndOffVideo()
     }
+    func showActivityIndicator() {
+        activityView = UIActivityIndicatorView(style: .large)
+        activityView?.center = self.view.center
+        activityView?.layer.zPosition = 20;
+        self.view.addSubview(activityView!)
+        activityView?.startAnimating()
+    }
+
+    func hideActivityIndicator(){
+        if (activityView != nil){
+            activityView?.stopAnimating()
+        }
+    }
     override func viewDidDisappear(_ animated: Bool) {
         print("viewDidDisappear")
         super.viewDidDisappear(animated)
         let userInfo = ["userInfo": ["isProvider": self.isProvider]]
         NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+        
        // NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("EndVideoCall"), object: nil)
         NotificationCenter.default.removeObserver(self)
+        NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
     }
     @objc func appMovedToBackground() {
         print("App moved to background!")
@@ -136,13 +153,22 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     }
     @objc func setPatientOnlineStatus(_ notification: Notification) {
        // let userinfo = notification.userInfo?["isOnline"] as? Bool
-        
-        if let isOnline = notification.userInfo?["isOnline"] as? Bool , !isCallInProgress {
-            isPatientOnLine = isOnline
+        if(!isCallInProgress){
+            if let ispatientOnline = notification.userInfo?["isOnline"] as? Bool{
+                isPatientOnLine = ispatientOnline
+            }else{
+                isPatientOnLine = false
+            }
             DispatchQueue.main.async {
                 self.patientStatusChanged()
             }
         }
+//        if let isOnline = notification.userInfo?["isOnline"] as? Bool , !isCallInProgress {
+//            isPatientOnLine = isOnline
+//            DispatchQueue.main.async {
+//                self.patientStatusChanged()
+//            }
+//        }
         
     }
     @objc func endVideoCall(_ notification: Notification){
@@ -155,8 +181,11 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         timer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(timerAction), userInfo: nil, repeats: true)
     }
     func stopTimer(){
-        timer.invalidate()
-        counter = 0
+        if(timer.isValid){
+            timer.invalidate()
+            counter = 0
+        }
+        
     }
     @objc func timerAction() {
         counter += 1
@@ -194,7 +223,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         //subscriberLabel.backgroundColor = UIColor(red: 31/255, green: 33/255, blue: 36/255, alpha: 1.0)
         subscriberLabel.textColor = .white//UIColor(hex: "#000000")
         subscriberLabel.textAlignment = .left
-        subscriberLabel.font = subscriberLabel.font.withSize(dynamicFontSize(15))
+        subscriberLabel.font = subscriberLabel.font.withSize(dynamicFontSize(UIDevice.current.userInterfaceIdiom == .pad ? 10 : 15))
         subscriberLabel.layer.zPosition = 1;
         
         timerLabel = UILabel(frame: CGRect(x: 30, y: Int(screenHeight) - 155, width: Int(remoteView.frame.size.width - 140), height: 40))
@@ -202,7 +231,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         //subscriberLabel.backgroundColor = UIColor(red: 31/255, green: 33/255, blue: 36/255, alpha: 1.0)
         timerLabel.textColor = .black//UIColor(hex: "#000000")
         timerLabel.textAlignment = .left
-        timerLabel.font = timerLabel.font.withSize(dynamicFontSize(15))
+        timerLabel.font = timerLabel.font.withSize(dynamicFontSize(UIDevice.current.userInterfaceIdiom == .pad ? 10 : 15))
         timerLabel.layer.zPosition = 1;
         let dummmyUrl = "https://www.gravatar.com/avatar/?d=mp"
         let url = URL(string: profilePicApiUrl.count > 10 ? profilePicApiUrl : dummmyUrl)!
@@ -220,6 +249,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         subscriberImg.frame = CGRect(x: (centerView.frame.width / 2) - 90, y: 0, width: 180, height: 180)
         subscriberImg.layer.cornerRadius = 90
         subscriberImg.clipsToBounds = true
+        subscriberImg.contentMode = .scaleAspectFill
         //subscriberImg.center = CGPoint(x: self.view.frame.size.width / 2, y: 0)
         //subscriberImg.center.x = remoteView.center.x - 70
         //subscriberImg.center.y = centerView.center.y - 100
@@ -236,7 +266,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         subscriberNameLabel.backgroundColor = .clear
         subscriberNameLabel.textColor = UIColor(hex: "#000000")
         subscriberNameLabel.textAlignment = .center
-        subscriberNameLabel.font = UIFont.boldSystemFont(ofSize: dynamicFontSize(20))
+        subscriberNameLabel.font = UIFont.boldSystemFont(ofSize: dynamicFontSize(UIDevice.current.userInterfaceIdiom == .pad ? 10 : 20 ))
         
         adminBtn = UIButton(frame: CGRect(x: (centerView.frame.width/2) - 10 - 100, y: 275, width: 100, height: 50))
         adminBtn.backgroundColor = UIColor(hex: "#DFF6ED")
@@ -245,18 +275,18 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         adminBtn.layer.cornerRadius = 10
         adminBtn.setTitleColor(UIColor(hex: "#000000"), for: .normal)
         adminBtn.setTitle("ADMIT", for: .normal)
-        adminBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: dynamicFontSize(15))
+        adminBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: dynamicFontSize(UIDevice.current.userInterfaceIdiom == .pad ? 10 : 15))
         // adminBtn.setBackgroundImage(UIImage(named: "callEnd"), for: .normal)
         adminBtn.addTarget(self, action:#selector(self.adminbuttonClicked), for: .touchUpInside)
-        
-        sendNotificationBtn = UIButton(frame: CGRect(x: (centerView.frame.width/2) - 110, y: 275, width: 220, height: 50))
+        let sendBtnWidth = UIDevice.current.userInterfaceIdiom == .pad ? 270 : 220
+        sendNotificationBtn = UIButton(frame: CGRect(x: (Int(centerView.frame.width)/2) - (sendBtnWidth/2), y: 275, width: sendBtnWidth, height: 50))
         sendNotificationBtn.backgroundColor = UIColor(hex: "#DFF6ED")
         sendNotificationBtn.layer.borderColor = UIColor(hex: "#60D2A7").cgColor
         sendNotificationBtn.layer.borderWidth = 2
         sendNotificationBtn.layer.cornerRadius = 10
         sendNotificationBtn.setTitleColor(UIColor(hex: "#000000"), for: .normal)
         sendNotificationBtn.setTitle(isPatientFromWeb ? "SEND EMAIL NOTIFICATION" : "SEND NOTIFICATION", for: .normal)
-        sendNotificationBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: dynamicFontSize(15))
+        sendNotificationBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: dynamicFontSize(UIDevice.current.userInterfaceIdiom == .pad ? 7 : 15))
         // adminBtn.setBackgroundImage(UIImage(named: "callEnd"), for: .normal)
         sendNotificationBtn.addTarget(self, action:#selector(self.sendNotificationbuttonClicked), for: .touchUpInside)
         
@@ -267,7 +297,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         denyBtn.layer.cornerRadius = 10
         denyBtn.setTitleColor(UIColor(hex: "#000000"), for: .normal)
         denyBtn.setTitle("DENY", for: .normal)
-        denyBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: dynamicFontSize(15))
+        denyBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: dynamicFontSize(UIDevice.current.userInterfaceIdiom == .pad ? 10 : 15))
         // adminBtn.setBackgroundImage(UIImage(named: "callEnd"), for: .normal)
         denyBtn.addTarget(self, action:#selector(self.denybuttonClicked), for: .touchUpInside)
         
@@ -298,6 +328,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         
         localView.layer.cornerRadius = 10;
         localView.clipsToBounds  =  true
+        localView.isHidden = true
         
         publisherLabel = UILabel(frame: CGRect(x: 0, y: Int(localView.frame.size.height - 40.0), width: Int(localView.frame.size.width), height: 40))
         publisherLabel.text = publisherName
@@ -305,29 +336,29 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         publisherLabel.textColor = .white//UIColor(hex: "#000000")
         publisherLabel.textAlignment = .center
         publisherLabel.layer.zPosition = 1;
-        publisherLabel.font = publisherLabel.font.withSize(dynamicFontSize(15))
+        publisherLabel.font = publisherLabel.font.withSize(dynamicFontSize(UIDevice.current.userInterfaceIdiom == .pad ? 10 : 15))
         localView.addSubview(publisherLabel)
         self.view.addSubview(localView)
         
-        callBtn = UIButton(frame: CGRect(x: 0, y: 0, width: 60, height: 60))
+        callBtn = UIButton(frame: CGRect(x: 240, y: 0, width: 60, height: 60))
         callBtn.backgroundColor = .clear
         callBtn.setBackgroundImage(UIImage(named: "callEnd"), for: .normal)
         callBtn.addTarget(self, action:#selector(self.callBtnbuttonClicked), for: .touchUpInside)
         bottomView.addSubview(callBtn)
         
-        camaraBtn = UIButton(frame: CGRect(x: 80, y: 0, width: 60, height: 60))
+        camaraBtn = UIButton(frame: CGRect(x: 0, y: 0, width: 60, height: 60))
         camaraBtn.backgroundColor = .clear
         camaraBtn.setBackgroundImage(UIImage(named: "cameraSwitch"), for: .normal)
         camaraBtn.addTarget(self, action:#selector(self.camaraBtnbuttonClicked), for: .touchUpInside)
         bottomView.addSubview(camaraBtn)
         
-        videoBtn = UIButton(frame: CGRect(x: 160, y: 0, width: 60, height: 60))
+        videoBtn = UIButton(frame: CGRect(x: 80, y: 0, width: 60, height: 60))
         videoBtn.backgroundColor = .clear
         videoBtn.setBackgroundImage(UIImage(named: "cameraOnWhite"), for: .normal)
         videoBtn.addTarget(self, action:#selector(self.videoBtnbuttonClicked), for: .touchUpInside)
         bottomView.addSubview(videoBtn)
         
-        audioBtn = UIButton(frame: CGRect(x: 240, y: 0, width: 60, height: 60))
+        audioBtn = UIButton(frame: CGRect(x: 160, y: 0, width: 60, height: 60))
         audioBtn.backgroundColor = .clear
         audioBtn.setBackgroundImage(UIImage(named: "microphoneOnWhite"), for: .normal)
         audioBtn.addTarget(self, action:#selector(self.audioBtnbuttonClicked), for: .touchUpInside)
@@ -339,6 +370,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         if(!isCallEnded){
             let userInfo = ["userInfo": ["isProvider": self.isProvider]]
             NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+            NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
         }
         
     }
@@ -406,19 +438,19 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         print("deny button clicked")
         centerView.isHidden = true
         let userInfo = ["userInfo": ["isProvider": isProvider]]
+       
         NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
         self.session?.disconnect(nil)
         self.stopTimer()
         self.dismiss(animated: true, completion: nil)
+        NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
     }
     
     @objc func callBtnbuttonClicked() {
         
         let userInfo = ["userInfo": ["isProvider": isProvider]]
         NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
-        self.session?.disconnect(nil)
-        self.stopTimer()
-        self.dismiss(animated: true, completion: nil)
+        self.endVonageCall()
     }
     
     @objc func camaraBtnbuttonClicked() {
@@ -453,6 +485,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         if (self.isAudioMute) {
             
             self.publisher?.publishAudio = true
+            //self.publisher.del
             self.audioBtn.setImage(UIImage(named : "microphoneOnWhite"), for: .normal)
             self.isAudioMute = false
         } else {
@@ -474,6 +507,8 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     
     //session methods
     func sessionDidConnect(_ session: OTSession) {
+        hideActivityIndicator()
+        localView.isHidden = false
         print("The client connected to the OpenTok session.")
         let userInfo = ["userInfo": ["isProvider": isProvider]]
 //        NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoStarted),object: nil,userInfo: userInfo)
@@ -562,8 +597,9 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
                   // cleanupSubscriber()
             let userInfo = ["userInfo": ["isProvider": isProvider]]
             NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
-            self.session?.disconnect(nil)
-            self.dismiss(animated: true, completion: nil)
+           // self.session?.disconnect(nil)
+            self.endVonageCall()
+            //self.dismiss(animated: true, completion: nil)
                }
         if(stream.videoType != .screen){
             subscriberImg.isHidden = false
@@ -639,18 +675,28 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     @IBAction func endCallAction(_ sender: Any) {
         isCallEnded = true
         let userInfo = ["userInfo": ["isProvider": self.isProvider]]
+        
         NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
         endVonageCall()
     }
     fileprivate func endVonageCall(){
         isCallEnded = true
+        let userInfo = ["userInfo": ["isProvider": self.isProvider]]
+        NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
         DispatchQueue.main.async {
+            print("video ended called")
+            self.session?.disconnect(nil)
+            
+//            self.publisher?.publishVideo = false
+            self.publisher?.videoCapture?.stop()
+//            self.publisher?.publishAudio = false
             
             self.cleanupSubscriber()
             self.cleanupPublisher()
-            self.session?.disconnect(nil)
             self.stopTimer()
-            // self.dismiss(animated: true, completion: nil)
+            self.dismiss(animated: true) {
+                print("video ended")
+            }
         }
     }
     fileprivate func cleanupSubscriber() {

package/ios/Plugin/vonagePlugin.swift

@@ -34,7 +34,8 @@ public class vonagePlugin: CAPPlugin {
         }
         NotificationCenter.default.addObserver(self,selector:#selector(videoEnded(_:)),name: NSNotification.Name (NotificationNames.videoEnded),object: nil)
         NotificationCenter.default.addObserver(self,selector:#selector(videoStarted(_:)),name: NSNotification.Name (NotificationNames.videoStarted),object: nil)
-        NotificationCenter.default.addObserver(self,selector:#selector(videoStarted(_:)),name: NSNotification.Name ("SendNotification"),object: nil)
+        NotificationCenter.default.addObserver(self,selector:#selector(sendNotification(_:)),name: NSNotification.Name ("SendNotification"),object: nil)
+        NotificationCenter.default.addObserver(self,selector:#selector(removeObservers(_:)),name: NSNotification.Name ("RemoveObservers"),object: nil)
 //        if let visibleViewCtrl = UIApplication.topViewController() {
 //            // do whatever you want with your `visibleViewCtrl`
 //            print(visibleViewCtrl)
@@ -64,15 +65,18 @@ public class vonagePlugin: CAPPlugin {
     }
     @objc func videoEnded(_ notification: Notification){
         self.notifyListeners(NotificationNames.videoEnded, data: notification.userInfo?["userInfo"] as? [String: Any] ?? [:])
-        NotificationCenter.default.removeObserver(self, name:  NSNotification.Name(NotificationNames.videoEnded), object: nil)
+//        NotificationCenter.default.removeObserver(self, name:  NSNotification.Name(NotificationNames.videoEnded), object: nil)
     }
     @objc func videoStarted(_ notification: Notification){
         self.notifyListeners(NotificationNames.videoStarted, data: notification.userInfo?["userInfo"] as? [String: Any] ?? [:])
-        NotificationCenter.default.removeObserver(self, name:  NSNotification.Name(NotificationNames.videoStarted), object: nil)
+//        NotificationCenter.default.removeObserver(self, name:  NSNotification.Name(NotificationNames.videoStarted), object: nil)
     }
     @objc func sendNotification(_ notification: Notification){
         self.notifyListeners("SendNotification", data: notification.userInfo?["userInfo"] as? [String: Any] ?? [:])
-        NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("SendNotification"), object: nil)
+//        NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("SendNotification"), object: nil)
+    }
+    @objc func removeObservers(_ notification: Notification){
+        NotificationCenter.default.removeObserver(self)
     }
 }
 extension UIApplication {

package/package.json

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