Commit f62453f7 authored by Marcin Adamczyk's avatar Marcin Adamczyk
Browse files

keep player valid after reaching video end

parent 5c422db7

android/src/main/java/com/brentvatne/react/ReactVideoView.java

+23 −10
Changes for android/src/main/java/com/brentvatne/react/ReactVideoView.java: 23 added lines, 10 removed lines.
Original line number Diff line number Diff line 
package com.brentvatne.react;



import android.media.MediaPlayer;

import android.net.Uri;

import android.os.Handler;

import android.util.Log;

import android.net.Uri;

import android.webkit.CookieManager;

import java.util.Map;

import java.util.HashMap;



import com.facebook.react.bridge.Arguments;

import com.facebook.react.bridge.WritableMap;

import com.facebook.react.bridge.LifecycleEventListener;

import com.facebook.react.bridge.WritableMap;

import com.facebook.react.uimanager.ThemedReactContext;

import com.facebook.react.uimanager.events.RCTEventEmitter;

import com.yqritc.scalablevideoview.ScalableType;

import com.yqritc.scalablevideoview.ScalableVideoView;



import java.util.HashMap;

import java.util.Map;



public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnPreparedListener, MediaPlayer

        .OnErrorListener, MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnInfoListener, LifecycleEventListener {
@@ -79,10 +81,10 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
    private float mRate = 1.0f;

    private boolean mPlayInBackground = false;



    private boolean mMediaPlayerValid = false; // True if mMediaPlayer is in prepared, started, or paused state.

    private boolean mMediaPlayerValid = false; // True if mMediaPlayer is in prepared, started, paused or completed state.

    private int mVideoDuration = 0;

    private int mVideoBufferedDuration = 0;

    private boolean isStalled = false;

    private boolean isCompleted = false;



    public ReactVideoView(ThemedReactContext themedReactContext) {

        super(themedReactContext);
@@ -98,7 +100,7 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
            @Override

            public void run() {



                if (mMediaPlayerValid) {

                if (mMediaPlayerValid && !isCompleted) {

                    WritableMap event = Arguments.createMap();

                    event.putDouble(EVENT_PROP_CURRENT_TIME, mMediaPlayer.getCurrentPosition() / 1000.0);

                    event.putDouble(EVENT_PROP_PLAYABLE_DURATION, mVideoBufferedDuration / 1000.0); //TODO:mBufferUpdateRunnable
@@ -126,6 +128,7 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
    }



    public void setSrc(final String uriString, final String type, final boolean isNetwork, final boolean isAsset) {



        mSrcUriString = uriString;

        mSrcType = type;

        mSrcIsNetwork = isNetwork;
@@ -196,6 +199,7 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
    }



    public void setRepeatModifier(final boolean repeat) {



        mRepeat = repeat;



        if (mMediaPlayerValid) {
@@ -204,6 +208,7 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
    }



    public void setPausedModifier(final boolean paused) {



        mPaused = paused;



        if (!mMediaPlayerValid) {
@@ -258,11 +263,13 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
    }



    public void setPlayInBackground(final boolean playInBackground) {



        mPlayInBackground = playInBackground;

    }



    @Override

    public void onPrepared(MediaPlayer mp) {



        mMediaPlayerValid = true;

        mVideoDuration = mp.getDuration();
@@ -293,6 +300,7 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 


    @Override

    public boolean onError(MediaPlayer mp, int what, int extra) {



        WritableMap error = Arguments.createMap();

        error.putInt(EVENT_PROP_WHAT, what);

        error.putInt(EVENT_PROP_EXTRA, extra);
@@ -307,11 +315,9 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
        switch (what) {

            case MediaPlayer.MEDIA_INFO_BUFFERING_START:

                mEventEmitter.receiveEvent(getId(), Events.EVENT_STALLED.toString(), Arguments.createMap());

                isStalled = true;

                break;

            case MediaPlayer.MEDIA_INFO_BUFFERING_END:

                mEventEmitter.receiveEvent(getId(), Events.EVENT_RESUME.toString(), Arguments.createMap());

                isStalled = false;

                break;

            case MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START:

                mEventEmitter.receiveEvent(getId(), Events.EVENT_READY_FOR_DISPLAY.toString(), Arguments.createMap());
@@ -337,29 +343,36 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
            mEventEmitter.receiveEvent(getId(), Events.EVENT_SEEK.toString(), event);



            super.seekTo(msec);

            if (isCompleted && mVideoDuration != 0 && msec < mVideoDuration) {

                isCompleted = false;

            }

        }

    }



    @Override

    public void onCompletion(MediaPlayer mp) {

        mMediaPlayerValid = false;



        isCompleted = true;

        mEventEmitter.receiveEvent(getId(), Events.EVENT_END.toString(), null);

    }



    @Override

    protected void onDetachedFromWindow() {



        mMediaPlayerValid = false;

        super.onDetachedFromWindow();

    }



    @Override

    protected void onAttachedToWindow() {



        super.onAttachedToWindow();

        setSrc(mSrcUriString, mSrcType, mSrcIsNetwork, mSrcIsAsset);

    }



    @Override

    public void onHostPause() {



        if (mMediaPlayer != null && !mPlayInBackground) {

            mMediaPlayer.pause();

        }