inViewPort addition

Author: aleccolville

README.md

@@ -8,7 +8,7 @@ React Native implementation of Brightcove Player native SDK video player.
 
 - Minimum Required version of iOS is 11
 - iOS Brightcove-Player-IMA 6.10.5
-- com.brightcove.player:android-ima-plugin 6.18.4
+- com.brightcove.player:android-ima-plugin 6.18.6
 
 ## Installation
 
@@ -73,7 +73,7 @@ import { BrightcoveIMAPlayer } from "react-native-brightcove-ima-player";
 | adVideoLoadTimeout     | number   | Set the amount of milliseconds for video to load. Default is `3000`                 |                              |
 | playbackRate           | number   | Set playback speed scale. Default is `1`                                            |                              |
 | disableDefaultControl  | boolean  | Disable default player control. Set `true` when you implement own video controller. |                              |
-| adStarted              | Function | Indicates the IMA ad has started                                              |                              |
+| adStarted              | Function | Indicates the IMA ad has started (ANDROID ONLY)                                     |                              |
 | onReady                | Function | Indicates the video can be played back                                              |                              |
 | onPlay                 | Function | Indicates the video playback starts                                                 |                              |
 | onPause                | Function | Indicates the video is paused                                                       |                              |

android/constants.gradle

@@ -1,5 +1,5 @@
 project.ext {
-    BRIGHTCOVE_VERSION = '6.18.4'
+    BRIGHTCOVE_VERSION = '6.18.6'
     PLAY_SERVICES_VERSION = '20.3.0'
     GOOGLE_IMA_SDK_VERSION = '3.21.1'
     ANDROIDX_LEGACY_SUPPORT_V4 = '1.0.0'

android/src/main/java/com/matejdr/brightcoveimaplayer/BrightcoveIMAPlayerView.java

@@ -63,6 +63,7 @@ public class BrightcoveIMAPlayerView extends RelativeLayout implements Lifecycle
   private boolean autoPlay = true;
   private boolean playing = false;
   private boolean adsPlaying = false;
+  private boolean inViewPort = true;
   private boolean disableDefaultControl = false;
   private int bitRate = 0;
   private int adVideoLoadTimeout = 3000;
@@ -211,13 +212,15 @@ public void processEvent(Event e) {
         reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(BrightcoveIMAPlayerView.this.getId(), BrightcoveIMAPlayerViewManager.EVENT_UPDATE_BUFFER_PROGRESS, event);
       }
     });
+  
   }
 
   public void setSettings(ReadableMap settings) {
     this.settings = settings;
-    if (settings != null && settings.hasKey("autoPlay")) {
-      this.autoPlay = settings.getBoolean("autoPlay");
-    }
+    // disabling autoPlay coming from settings object
+    // if (settings != null && settings.hasKey("autoPlay")) {
+    //   this.autoPlay = settings.getBoolean("autoPlay");
+    // }
   }
 
   public void setPolicyKey(String policyKey) {
@@ -277,6 +280,16 @@ public void toggleFullscreen(boolean isFullscreen) {
     }
   }
 
+  public void toggleInViewPort(boolean inViewPort) {
+    if (inViewPort) {
+      this.inViewPort = true;
+    } else {
+      this.inViewPort = false;
+      // need to pause here also - (differs from IOS behaviour)
+      this.pause();
+    }
+  }
+
   public void setVolume(float volume) {
     Map<String, Object> details = new HashMap<>();
     details.put(Event.VOLUME, volume);
@@ -319,7 +332,7 @@ public void pause() {
     if (this.brightcoveVideoView != null) {
       if (this.adsPlaying && this.googleIMAComponent != null) {
         this.googleIMAComponent.getVideoAdPlayer().pauseAd();
-      } else {
+      } else if (this.playing) {
         this.brightcoveVideoView.pause();
       }
     }
@@ -328,7 +341,6 @@ public void pause() {
   public void play() {
     if (this.brightcoveVideoView != null) {
       if (this.adsPlaying && this.googleIMAComponent != null) {
-        //this.brightcoveVideoView.pause();
         this.googleIMAComponent.getVideoAdPlayer().resumeAd();
       } else {
         this.brightcoveVideoView.start();
@@ -400,7 +412,7 @@ private void fixVideoLayout() {
   }
 
   /*
-    This methods show how to the the Google IMA AdsManager, get the cue points and add the markers
+    This methods show how to get the Google IMA AdsManager, get the cue points and add the markers
     to the Brightcove Seek Bar.
    */
   private void setupAdMarkers(BaseVideoView videoView) {
@@ -416,7 +428,6 @@ private void setupAdMarkers(BaseVideoView videoView) {
         // If cuepoint is negative it means it is a POST ROLL.
         int markerTime = cuepoint < 0 ? brightcoveSeekBar.getMax() : (int) (cuepoint * DateUtils.SECOND_IN_MILLIS);
         mediaController.getBrightcoveSeekBar().addMarker(markerTime);
-
       }
     });
     videoView.setMediaController(mediaController);
@@ -444,9 +455,7 @@ private void setupGoogleIMA() {
       adsPlaying = false;
     });
 
-    // Set up a listener for initializing AdsRequests. The Google
-    // IMA plugin emits an ad request event as a result of
-    // initializeAdsRequests() being called.
+    // Set up a listener for initializing AdsRequests. 
     eventEmitter.on(GoogleIMAEventType.ADS_REQUEST_FOR_VIDEO, event -> {
       String IMAUrl = settings != null && settings.hasKey("IMAUrl") ?
         settings.getString("IMAUrl") : "";
@@ -481,18 +490,16 @@ private void setupGoogleIMA() {
 
   @Override
   public void onHostResume() {
-    if (this.adsPlaying && this.googleIMAComponent != null && googleIMAComponent.getVideoAdPlayer() != null) {
-      this.googleIMAComponent.getVideoAdPlayer().playAd();
-    } else if (this.playing && this.brightcoveVideoView != null) {
-      this.brightcoveVideoView.start();
-    }
+    // handleAppStateDidChange active
+    this.pause();
+    this.toggleInViewPort(true);
   }
 
   @Override
   public void onHostPause() {
-    if (this.adsPlaying && this.googleIMAComponent != null && googleIMAComponent.getVideoAdPlayer() != null) {
-      googleIMAComponent.getVideoAdPlayer().pause();
-    }
+    // handleAppStateDidChange background
+    this.pause();
+    this.toggleInViewPort(false);
   }
 
   @Override

android/src/main/java/com/matejdr/brightcoveimaplayer/BrightcoveIMAPlayerViewManager.java

@@ -22,6 +22,7 @@ public class BrightcoveIMAPlayerViewManager extends SimpleViewManager<Brightcove
   public static final int COMMAND_PAUSE = 3;
   public static final int COMMAND_STOP_PLAYBACK = 4;
   public static final int COMMAND_TOGGLE_FULLSCREEN = 5;
+  public static final int COMMAND_TOGGLE_IN_VIEW_PORT = 6;
   public static final String AD_STARTED = "ad_started";
   public static final String EVENT_READY = "ready";
   public static final String EVENT_PLAY = "play";
@@ -124,7 +125,9 @@ public Map<String, Integer> getCommandsMap() {
       "stopPlayback",
       COMMAND_STOP_PLAYBACK,
       "toggleFullscreen",
-      COMMAND_TOGGLE_FULLSCREEN
+      COMMAND_TOGGLE_FULLSCREEN,
+      "toggleInViewPort",
+      COMMAND_TOGGLE_IN_VIEW_PORT
     );
   }
 
@@ -153,6 +156,10 @@ public void receiveCommand(BrightcoveIMAPlayerView view, int commandType, @Nulla
         view.toggleFullscreen((boolean) (args.getBoolean(0)));
         return;
       }
+      case COMMAND_TOGGLE_IN_VIEW_PORT: {
+        view.toggleInViewPort((boolean) (args.getBoolean(0)));
+        return;
+      }
     }
   }
 

ios/BrightcoveIMAPlayerView.h

@@ -32,12 +32,12 @@
 @property (nonatomic) float targetPlaybackRate;
 @property (nonatomic) BOOL playbackServiceDirty;
 @property (nonatomic) NSTimeInterval currentVideoDuration;
+@property (nonatomic) BOOL inViewPort;
 
 @property (nonatomic, copy) NSDictionary *settings;
 @property (nonatomic, copy) NSString *videoId;
 @property (nonatomic, copy) NSString *accountId;
 @property (nonatomic, copy) NSString *policyKey;
-@property (nonatomic, copy) RCTDirectEventBlock adStarted;
 @property (nonatomic, copy) RCTDirectEventBlock onReady;
 @property (nonatomic, copy) RCTDirectEventBlock onPlay;
 @property (nonatomic, copy) RCTDirectEventBlock onPause;
@@ -51,6 +51,7 @@
 -(void) setupWithSettings:(NSString*)settings;
 -(void) seekTo:(NSNumber *)time;
 -(void) toggleFullscreen:(BOOL)isFullscreen;
+-(void) toggleInViewPort:(BOOL)inViewPort;
 -(void) pause;
 -(void) play;
 -(void) stopPlayback;