capacitor-plugin-vonage 0.0.3 → 0.0.4

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
-        <activity android:name="com.managemyhealth.plugin.vonage.VideoCallActivity">
+        <activity android:name="com.managemyhealth.plugin.vonage.VideoCallActivity"
+            android:screenOrientation="portrait">
         </activity>
     </application>
 </manifest>

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

@@ -1,9 +1,12 @@
 package com.managemyhealth.plugin.vonage;
 
 
-
+import android.annotation.SuppressLint;
+import android.os.AsyncTask;
 import android.app.ActionBar;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.nfc.Tag;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
@@ -32,6 +35,7 @@ import com.opentok.android.SubscriberKit;
 //import com.tokbox.sample.basicvideochat.network.APIService;
 //import com.tokbox.sample.basicvideochat.network.GetSessionResponse;
 
+import java.io.InputStream;
 import java.util.List;
 
 import okhttp3.OkHttpClient;
@@ -47,8 +51,10 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     private static final String TAG = VideoCallActivity.class.getSimpleName();
     private static final int PERMISSIONS_REQUEST_CODE = 124;
 
-    private Session session;
+    public Session session;
     private Publisher publisher;
+    String SUBSCRIBERNAME ;
+    String PUBLISHERNAME;
     boolean isMuted = false;
     boolean isCamOff = false;
     boolean isTimeron = false;
@@ -80,12 +86,12 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         public void onError(PublisherKit publisherKit, OpentokError opentokError) {
             finishWithMessage("PublisherKit onError: " + opentokError.getMessage());
         }
+
     };
 
     private final Session.SessionListener sessionListener = new Session.SessionListener() {
         @Override
         public void onConnected(Session session) {
-
             Log.d(TAG, "onConnected: Connected to session: " + session.getSessionId());
 //            JSObject eventData = new JSObject();
 //            eventData.put("key", "value");
@@ -139,12 +145,14 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
         @Override
         public void onStreamReceived(Session session, Stream stream) {
+
             Log.d(TAG, "onStreamReceived: New Stream Received " + stream.getStreamId() + " in session: " + session.getSessionId());
 
             if (subscriber == null) {
                 subscriber = new Subscriber.Builder(VideoCallActivity.this, stream).build();
                 subscriber.getRenderer().setStyle(BaseVideoRenderer.STYLE_VIDEO_SCALE, BaseVideoRenderer.STYLE_VIDEO_FILL);
                 subscriber.setSubscriberListener(subscriberListener);
+                subscriber.setVideoListener(videoListener);
                 session.subscribe(subscriber);
                 try {
                     subscriberViewContainer.addView(subscriber.getView());
@@ -152,6 +160,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                     Log.d("subscriberViewContainer", e.toString());
 
                 }
+                showToast(SUBSCRIBERNAME + "joined the call");
+
             }
         }
 
@@ -175,17 +185,51 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                 if (subscriber != null) {
                     subscriber = null;
                     subscriberViewContainer.removeAllViews();
+                    showToast(SUBSCRIBERNAME + " left the call");
+
                 }
             }
         }
 
+
         @Override
         public void onError(Session session, OpentokError opentokError) {
             finishWithMessage("Session error: " + opentokError.getMessage());
         }
     };
+    SubscriberKit.VideoListener videoListener = new  SubscriberKit.VideoListener() {
+
+        @Override
+        public void onVideoDataReceived(SubscriberKit subscriberKit) {
+
+        }
+
+        @Override
+        public void onVideoDisabled(SubscriberKit subscriberKit, String s) {
+            showToast(SUBSCRIBERNAME + " video disabled");
+
+        }
+
+        @Override
+        public void onVideoEnabled(SubscriberKit subscriberKit, String s) {
+            showToast(SUBSCRIBERNAME + " video enabled");
+
+
+        }
+
+        @Override
+        public void onVideoDisableWarning(SubscriberKit subscriberKit) {
+
+        }
+
+        @Override
+        public void onVideoDisableWarningLifted(SubscriberKit subscriberKit) {
+
+        }
+    };
 
     SubscriberKit.SubscriberListener subscriberListener = new SubscriberKit.SubscriberListener() {
+
         @Override
         public void onConnected(SubscriberKit subscriberKit) {
             Log.d(TAG, "onConnected: Subscriber connected. Stream: " + subscriberKit.getStream().getStreamId());
@@ -194,10 +238,14 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         @Override
         public void onDisconnected(SubscriberKit subscriberKit) {
             Log.d(TAG, "onDisconnected: Subscriber disconnected. Stream: " + subscriberKit.getStream().getStreamId());
+
         }
 
+
+
         @Override
         public void onError(SubscriberKit subscriberKit, OpentokError opentokError) {
+            showToast(SUBSCRIBERNAME + " failed to connect to the call");
             finishWithMessage("SubscriberKit onError: " + opentokError.getMessage());
         }
     };
@@ -219,6 +267,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         session.disconnect();
     }
 
+    @SuppressLint("MissingInflatedId")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
@@ -226,6 +275,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.video_call_layout);
+        new DownloadImageFromInternet((ImageView) findViewById(R.id.image_view)).execute("https://www.gravatar.com/avatar/?d=mp");
+
         getSupportActionBar().hide();
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
@@ -237,15 +288,15 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
             String TOKEN = intent.getStringExtra("token");
             String SESSION_ID = intent.getStringExtra("sessionId");
             String API_KEY = intent.getStringExtra("apiKey");
-            String SUBSCRIBERNAME = intent.getStringExtra("subscriberName");
-            String PUBLISHERNAME = intent.getStringExtra("publisherName");
+             SUBSCRIBERNAME = intent.getStringExtra("subscriberName");
+             PUBLISHERNAME = intent.getStringExtra("publisherName");
             ISPROVIDER = intent.getBooleanExtra("isProvider",false);
             publisherViewContainer = findViewById(R.id.publisher_container);
             subscriberViewContainer = findViewById(R.id.subscriber_container);
             TextView publisherNameTextView = findViewById(R.id.publisherName);
             TextView subscriberNameTextView = findViewById(R.id.subscriberName);
-            publisherNameTextView.setText(PUBLISHERNAME);
-            subscriberNameTextView.setText(SUBSCRIBERNAME);
+            publisherNameTextView.setText(SUBSCRIBERNAME);
+            subscriberNameTextView.setText(PUBLISHERNAME);
             timerTextView = findViewById(R.id.timerTextView);
         startTime = System.currentTimeMillis();
             isTimeron =true;
@@ -270,30 +321,34 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
             }
         });
 
-        imageViewMute.setOnClickListener(new View.OnClickListener() {
+        imageViewMute.setOnClickListener(new View.OnClickListener() {//mute and unmute audio
             @Override
             public void onClick(View v) {
 
-                if (!isMuted) {
-                    publisher.setPublishAudio(false);
-                    imageViewMute.setImageResource(R.drawable.microphoneoff);
-                } else {
-                    publisher.setPublishAudio(true);
-                    imageViewMute.setImageResource(R.drawable.microphoneonwhite);
+               if(publisher!=null) {
+                    if (!isMuted) {
+                        publisher.setPublishAudio(false);
+                        imageViewMute.setImageResource(R.drawable.microphoneoff);
+                    } else {
+                        publisher.setPublishAudio(true);
+                        imageViewMute.setImageResource(R.drawable.microphoneonwhite);
+                    }
+                    isMuted = !isMuted;
                 }
-                isMuted = !isMuted;
 
             }
         });
-        imageViewCamOff.setOnClickListener(new View.OnClickListener() {
+        imageViewCamOff.setOnClickListener(new View.OnClickListener() {//off & on camera
             @Override
             public void onClick(View v) {
+                if(publisher!=null) {
 
                 if (!isCamOff) {
                     publisher.setPublishVideo(false);
                     imageViewCamOff.setImageResource(R.drawable.cameraoff);
                     imageViewCamSwitch.setVisibility(View.GONE);
 
+
                 } else {
                     publisher.setPublishVideo(true);
                     imageViewCamOff.setImageResource(R.drawable.cameraonwhite);
@@ -303,14 +358,14 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                 isCamOff = !isCamOff;
 
             }
+            }
         });
         imageViewCamSwitch.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                publisher.cycleCamera();
-
-
-
+                if(publisher!=null) {
+                    publisher.cycleCamera();//flip camera
+                }
             }
         });
 
@@ -335,21 +390,24 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         }
     }
     public void endCall() {
-        isEndall =true;
-        killvc();
-
-    }
-    public void killvc(){
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Log.d("endVideoCall","PluginMethodendVideoCall");
-                // Update UI components or perform UI-related operations here
-            }
-        });
+        session.disconnect();
 
+        isEndall =true;
+//        killvc();
 
     }
+//    public void killvc(){
+//        runOnUiThread(new Runnable() {
+//            @Override
+//            public void run() {
+//                Log.d("endVideoCall","PluginMethodendVideoCall");
+//                Log.d("endVideoCall",session.toString());
+//
+//            }
+//        });
+//
+//
+//    }
     private void startTimer() {
 //        startTime = System.currentTimeMillis();
         Handler handler = new Handler();
@@ -424,10 +482,10 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
 
     private void initializeSession(String apiKey, String sessionId, String token) {
+        Log.i(TAG, "initializeSession: " + "initializeSession");
         Log.i(TAG, "apiKey: " + apiKey);
         Log.i(TAG, "sessionId: " + sessionId);
         Log.i(TAG, "token: " + token);
-
         /*
         The context used depends on the specific use case, but usually, it is desired for the session to
         live outside of the Activity e.g: live between activities. For a production applications,
@@ -436,6 +494,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         session = new Session.Builder(this, apiKey, sessionId).build();
         session.setSessionListener(sessionListener);
         session.connect(token);
+        Log.d("initializeSession","session.toString()");
+        Log.d("initializeSession",session.toString());
     }
 
 //    private void initRetrofit() {
@@ -455,9 +515,12 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 ////        apiService = retrofit.create(APIService.class);
 //    }
 
+    private void showToast(String message) {
+        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+    }
     private void finishWithMessage(String message) {
         Log.e(TAG, message);
-        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+//        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
         session.disconnect();
         Intent resultIntent = new Intent();
         String resultcode = ISPROVIDER?"999":"888";
@@ -465,4 +528,26 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         setResult(RESULT_OK, resultIntent);
         this.finish();
     }
+    private class DownloadImageFromInternet extends AsyncTask<String, Void, Bitmap> {
+        ImageView imageView;
+        public DownloadImageFromInternet(ImageView imageView) {
+            this.imageView=imageView;
+            Toast.makeText(getApplicationContext(), "Please wait, it may take a few minute...",Toast.LENGTH_SHORT).show();
+        }
+        protected Bitmap doInBackground(String... urls) {
+            String imageURL=urls[0];
+            Bitmap bimage=null;
+            try {
+                InputStream in=new java.net.URL(imageURL).openStream();
+                bimage= BitmapFactory.decodeStream(in);
+            } catch (Exception e) {
+                Log.e("Error Message", e.getMessage());
+                e.printStackTrace();
+            }
+            return bimage;
+        }
+        protected void onPostExecute(Bitmap result) {
+            imageView.setImageBitmap(result);
+        }
+    }
 }

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

@@ -38,8 +38,8 @@ public class vonagePlugin extends Plugin {
             @Override
             public void run() {
                 try{
-                    VideoCallActivity videoCallActivity = new VideoCallActivity();
-                    videoCallActivity.endCall();
+//                    VideoCallActivity videoCallActivity = new VideoCallActivity();
+//                    videoCallActivity.;
                 }catch (Exception e){
                     showLog(e.toString());
                 }
@@ -67,7 +67,6 @@ public class vonagePlugin extends Plugin {
         intent.putExtra("token",TOKEN);
         intent.putExtra("subscriberName",SUBSCRIBERNAME);
         intent.putExtra("publisherName",PUBLISHERNAME);
-        intent.putExtra("publisherName",PUBLISHERNAME);
         intent.putExtra("isProvider",ISPROVIDER);
 //        intent.putExtra("callbackIdentifier", );
 //        notifyListeners("onDataReceived", );
@@ -107,13 +106,16 @@ public class vonagePlugin extends Plugin {
             showLog("ewererewrwerwe");
             showLog(e.toString());
         }
-        if(isProvid){
-            eventData.put("isProvider", true);
-            notifyListeners("VideoCallEnded",eventData);
-        }else{
-            eventData.put("isProvider", false);
-            Log.d(TAG,"CODE 98 -----------" );
-            notifyListeners("VideoCallEnded",eventData);
+        VideoCallActivity videoCallActivity = new VideoCallActivity();
+        if(!videoCallActivity.isEndall){
+            if (isProvid) {
+                eventData.put("isProvider", true);
+                notifyListeners("VideoCallEnded", eventData);
+            } else {
+                eventData.put("isProvider", false);
+                Log.d(TAG, "CODE 98 -----------");
+                notifyListeners("VideoCallEnded", eventData);
+            }
         }
     }
 

package/android/src/main/res/layout/video_call_layout.xml

@@ -30,21 +30,32 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
+<!--                android:background="#FF5733"-->
 
                 <FrameLayout
                     android:id="@+id/subscriber_container"
                     android:layout_width="fill_parent"
-                    android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    android:background="#9b9c98" >
+
+                    <ImageView
+                        android:id="@+id/image_view"
+                        android:layout_width="150dp"
+                        android:layout_height="150dp"
+                        android:scaleType="centerCrop" />
+                </FrameLayout>
 
                 <TextView
                     android:id="@+id/publisherName"
-                    android:layout_width="140dp"
-                    android:layout_height="157dp"
+                    android:layout_width="150dp"
+                    android:layout_height="wrap_content"
+
                     android:layout_gravity="bottom|start"
                     android:paddingLeft="10dp"
                     android:paddingBottom="120dp"
+
                     android:text="Publisher Name"
-                    android:textColor="@android:color/background_dark"
+                    android:textColor="@android:color/white"
                     android:textSize="16sp"
                     android:visibility="visible" />
                 <TextView
@@ -56,7 +67,7 @@
                     android:paddingLeft="10dp"
                     android:text="00:00:00"
                     android:visibility="visible"
-                    android:textColor="@android:color/background_dark"
+                    android:textColor="@android:color/white"
                     android:textSize="16sp" />
 
                 <FrameLayout
@@ -67,21 +78,39 @@
                     android:layout_marginEnd="16dp"
                     android:layout_marginRight="16dp"
                     android:layout_marginBottom="80dp"
-                    android:background="#FFFFFF"
+                    android:background="#9b9c98"
                     android:layout_below="@id/subscriberName"
 
                     android:padding="2dp" >
 
-                    <TextView
-                        android:id="@+id/subscriberName"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom|start"
-                        android:textSize="12sp"
-                        android:text="Subscriber Name"
-                        android:paddingBottom="5dp"
-                        android:textColor="@android:color/background_dark" />
                 </FrameLayout>
+                <TextView
+                    android:id="@+id/subscriberName"
+                    android:layout_width="100dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom|end"
+                    android:textSize="12sp"
+                    android:text="Subscriber Name"
+                    android:paddingBottom="25dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginBottom="80dp"
+                    android:textColor="@android:color/white" />
+                <androidx.cardview.widget.CardView
+                    android:layout_width="155dp"
+                    android:layout_height="155dp"
+                    app:cardCornerRadius="250dp"
+                    app:cardBackgroundColor="@android:color/white">
+
+                    <androidx.cardview.widget.CardView
+                        android:layout_width="150dp"
+                        android:layout_height="150dp"
+                        app:cardCornerRadius="250dp"
+                        android:layout_gravity="center">
+
+                    </androidx.cardview.widget.CardView>
+
+                </androidx.cardview.widget.CardView>
+
 
             </FrameLayout>
 
@@ -94,7 +123,7 @@
 
         <LinearLayout
             android:layout_width="fill_parent"
-            android:layout_height="49dp"
+            android:layout_height="53dp"
             android:layout_alignParentBottom="false"
             android:gravity="clip_horizontal"
             android:orientation="horizontal"

package/ios/Plugin/VideoChatViewController.swift

@@ -92,6 +92,12 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
 //
 //            self.connectToAnOpenTokSession()
 //        })
+//        if(isVideoMute){
+//            subscriberImg.isHidden = true
+//        }else{
+//            subscriberImg.isHidden = false
+//        }
+       // turnOnAndOffVideo()
     }
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
@@ -252,6 +258,9 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     }
     
     @objc func videoBtnbuttonClicked() {
+        turnOnAndOffVideo()
+    }
+    func turnOnAndOffVideo(){
         if (self.isVideoMute) {
             self.publisher?.publishVideo = true
             self.videoBtn.setImage(UIImage(named : "cameraOnWhite"), for: .normal)
@@ -294,6 +303,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         let settings = OTPublisherSettings()
         settings.name = publisherName
         guard let publisher = OTPublisher(delegate: self, settings: settings) else {
+            print("publisher create error")
             return
         }
         self.publisher = publisher
@@ -305,6 +315,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         }
         
         guard let publisherView = publisher.view else {
+            print("publisher view not created")
             return
         }
         
@@ -319,6 +330,10 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     func sessionDidDisconnect(_ session: OTSession) {
         print("The client disconnected from the OpenTok session.")
        // self.session?.disconnect(nil)
+        if(!isCallEnded){
+            let userInfo = ["userInfo": ["isProvider": self.isProvider]]
+            NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+        }
         self.dismiss(animated: true, completion: nil)
     }
     
@@ -345,6 +360,9 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         }
         
         subscriberView.frame = UIScreen.main.bounds
+        if(stream.videoType == .screen){
+            subscriberView.accessibilityValue = "from screen"
+        }
         remoteView.addSubview(subscriberView)
     }
     
@@ -356,16 +374,26 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
 //            self.session?.disconnect(nil)
 //            self.dismiss(animated: true, completion: nil)
 //        }
-        if let subStream = subscriber?.stream, subStream.streamId == stream.streamId,!isProvider {
+        if let subStream = subscriber?.stream, subStream.streamId == stream.streamId,!isProvider, stream.videoType != .screen {
                   // 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)
                }
-        subscriberImg.isHidden = false
-        showToast(message: "\(subscriberName) is left the call")
-        cleanupSubscriber()
+        if(stream.videoType != .screen){
+            subscriberImg.isHidden = false
+            showToast(message: "\(subscriberName) is left the call")
+            cleanupSubscriber()
+        }
+        if(stream.videoType == .screen){
+            for subview in remoteView.subviews{
+                if(subview.accessibilityValue == "from screen"){
+                    subview.removeFromSuperview()
+                }
+            }
+        }
+        
         
     }
     
@@ -387,7 +415,10 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     public func subscriberDidConnect(toStream subscriber: OTSubscriberKit) {
         print("The subscriber did connect to the stream.")
         subscriberImg.isHidden = true
-        showToast(message: "\(subscriberName) is joined the call")
+        if(subscriber.stream?.videoType != .screen){
+            showToast(message: "\(subscriberName) is joined the call")
+        }
+        
     }
     
     public func subscriber(_ subscriber: OTSubscriberKit, didFailWithError error: OTError) {

package/package.json

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