capacitor-plugin-vonage 0.1.2 → 0.1.4

package/ios/Plugin/VideoChatViewController.swift

@@ -8,7 +8,7 @@
 import UIKit
 import OpenTok
 
-class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDelegate,OTSubscriberDelegate  {
+class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDelegate,OTSubscriberDelegate,CustomeAlertDelegate  {
     var isCallEnded = false
     var kApiKey = ""
     var kSessionId = ""
@@ -29,6 +29,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     var session: OTSession?
     var publisher: OTPublisher?
     var subscriber: OTSubscriber?
+    var screenTypesubscriber: OTSubscriber?
     
     var bottomView = UIView()
     var remoteView = UIView()
@@ -59,6 +60,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         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()
+        UserDefaults.standard.set(isProvider, forKey: "isProvider")
         self.viewSetupMethod()
         // let jsonParam = videoCallParam.toJSON() as? [String:AnyObject] // can be any type here
         // print(jsonParam as Any)
@@ -104,6 +106,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         super.viewDidAppear(animated)
         NotificationCenter.default.addObserver(self, selector: #selector(deviceOrientationDidChange), name: UIDevice.orientationDidChangeNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(setPatientOnlineStatus), name: NSNotification.Name ("PatientOnlineStatus"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(notificationSent), name: NSNotification.Name ("notificationSent"), object: nil)
         NotificationCenter.default.addObserver(self,selector:#selector(endVideoCall(_:)),name: NSNotification.Name ("EndVideoCall"),object: nil)
 
     }
@@ -147,7 +150,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     }
     @objc func setPatientOnlineStatus(_ notification: Notification) {
        // let userinfo = notification.userInfo?["isOnline"] as? Bool
-        if(!isCallInProgress){
+       // if(!isCallInProgress){
             if let ispatientOnline = notification.userInfo?["isOnline"] as? Bool{
                 isPatientOnLine = ispatientOnline
             }else{
@@ -156,7 +159,8 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
             DispatchQueue.main.async {
                 self.patientStatusChanged()
             }
-        }
+       
+       // }
 //        if let isOnline = notification.userInfo?["isOnline"] as? Bool , !isCallInProgress {
 //            isPatientOnLine = isOnline
 //            DispatchQueue.main.async {
@@ -165,6 +169,9 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
 //        }
         
     }
+    @objc func notificationSent(_ notification: Notification) {
+        self.showToast(message: "Notification has been sent")
+    }
     @objc func endVideoCall(_ notification: Notification){
         print("end video call called")
         endVonageCall()
@@ -379,6 +386,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
             sendNotificationBtn.isHidden = true
             adminBtn.isHidden = false
             denyBtn.isHidden = false
+            subscriberStatusLabel.isHidden = false
             subscriberStatusLabel.text = "WAITING"
             subscriberStatusLabel.backgroundColor = UIColor(hex: "#DFF6ED")
             subscriberNameLabel.isHidden = false
@@ -387,6 +395,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
             sendNotificationBtn.isHidden = false
             adminBtn.isHidden = true
             denyBtn.isHidden = true
+            subscriberStatusLabel.isHidden = false
             subscriberStatusLabel.text = "OFFLINE"
             subscriberStatusLabel.backgroundColor = UIColor(hex: "#ffd6ca")
             subscriberNameLabel.isHidden = false
@@ -437,18 +446,23 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     }
     @objc func denybuttonClicked() {
         print("deny button clicked")
+//        centerView.isHidden = true
+//        let userInfo = ["isProvider": isProvider]
+//        delegate?.videoCallEnded(userInfo)
+//        self.endVonageCall()
+        //delegate?.videoCallShowAlert()
+        let customAlert = CustomAlertViewController(nibName: "CustomAlertViewController", bundle: Bundle(for: CustomAlertViewController.self))
+        customAlert.isModalInPresentation = true
+        customAlert.delegate = self
+        customAlert.modalPresentationStyle = .popover
+        self.present(customAlert, animated: true)
+    }
+    func btnYesClicked() {
         centerView.isHidden = true
-        let userInfo = ["isProvider": isProvider]
-       
-       // NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+        let userInfo:[String:Any] = ["isProvider": isProvider,"message":"deny"]
         delegate?.videoCallEnded(userInfo)
-//        self.session?.disconnect(nil)
-//        self.stopTimer()
-//        self.dismiss(animated: true, completion: nil)
-//        NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
         self.endVonageCall()
     }
-    
     @objc func callBtnbuttonClicked() {
         
         let userInfo = ["isProvider": isProvider]
@@ -565,11 +579,11 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     }
     
     func session(_ session: OTSession, streamCreated stream: OTStream) {
-        subscriber = OTSubscriber(stream: stream, delegate: self)
+        var subscriber = OTSubscriber(stream: stream, delegate: self)
         guard let subscriber = subscriber else {
             return
         }
-        self.subscriber = subscriber
+        //self.subscriber = subscriber
         var error: OTError?
         session.subscribe(subscriber, error: &error)
         guard error == nil else {
@@ -585,6 +599,10 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         subscriberView.frame = UIScreen.main.bounds
         if(stream.videoType == .screen){
             subscriberView.accessibilityValue = "from screen"
+            subscriber.viewScaleBehavior = .fit
+            self.screenTypesubscriber = subscriber
+        }else{
+            self.subscriber = subscriber
         }
         timerLabel.textColor = .white
         publisherLabel.textColor = .white
@@ -624,7 +642,15 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         
         
     }
-    
+    func sessionDidBeginReconnecting(_ session:OTSession) {
+        // Display a user interface notification.
+        print("sessionDidBeginReconnecting \(session.sessionId)")
+    }
+
+    func sessionDidReconnect(_ session: OTSession) {
+        // Adjust user interface.
+        print("sessionDidReconnect \(session.sessionId)")
+    }
     //Publisher methods
     func publisher(_ publisher: OTPublisherKit, didFailWithError error: OTError) {
         print("The publisher failed: \(error)")
@@ -789,11 +815,12 @@ extension UIViewController {
 
 func showToast(message : String) {
     DispatchQueue.main.async {
-        let toastLabel = UILabel(frame: CGRect(x: 100, y: 40, width: self.view.frame.size.width - 100, height: 50))
+       let spacing = UIDevice.current.userInterfaceIdiom == .pad ? 250 : 100
+        let toastLabel = UILabel(frame: CGRect(x: spacing, y: 40, width: Int(self.view.frame.size.width) - spacing, height: 50))
        // toastLabel.center.x = self.view.center.x
         toastLabel.backgroundColor = UIColor(hex: "#0B6623")//UIColor.white.withAlphaComponent(0.6)
         toastLabel.textColor = .white//UIColor.black
-        toastLabel.font = .systemFont(ofSize: 12.0)
+        toastLabel.font = .systemFont(ofSize: 14.0)
         toastLabel.textAlignment = .center;
         toastLabel.text = message
         toastLabel.alpha = 1.0

package/ios/Plugin/vonagePlugin.m

@@ -8,4 +8,5 @@ CAP_PLUGIN(vonagePlugin, "vonage",
            CAP_PLUGIN_METHOD(openVideoCallWindow, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(endVideoCall, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(setPatientOnlineStatus, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(setSendNotificationStatus, CAPPluginReturnPromise);
 )

package/ios/Plugin/vonagePlugin.swift

@@ -12,7 +12,9 @@ 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
@@ -49,6 +51,14 @@ public class vonagePlugin: CAPPlugin,VonageSDKInteractionDelegate {
         
         call.resolve(["value": "setPatientOnlineStatus"])
     }
+    @objc func setSendNotificationStatus(_ call: CAPPluginCall) {
+       
+        let isSuccess = call.getBool("isSuccess") ?? false
+        
+        NotificationCenter.default.post(name: NSNotification.Name("notificationSent"),object: nil,userInfo: ["isSuccess":isSuccess])
+        
+        call.resolve(["value": "setSendNotificationStatus"])
+    }
     @objc func endVideoCall(_ call: CAPPluginCall) {
         NotificationCenter.default.post(name: NSNotification.Name("EndVideoCall"),object: nil,userInfo: nil)
         call.resolve(["value": "Video call ended."])
@@ -106,3 +116,6 @@ func videoCallStarted(_ data: [String: Any])
 func videoCallEnded(_ data: [String: Any])
 func videoCallSendNotification(_ data: [String: Any])
 }
+protocol CustomeAlertDelegate: AnyObject {
+func btnYesClicked()
+}

package/package.json

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