Commit d450afc8 authored by Jhen-Jie Hong's avatar Jhen-Jie Hong Committed by Matt Apperson
Browse files

[Android] Fix `require(...)` file resource on production (#429) 

* Fix require(...) file resource on Android production

* Update example (use require for ./broadchurch.mp4)

* Fix MainApplication.java of example

* Add default source type
parent 201335f0

android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java

+7 −0
Changes for android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -84,10 +84,17 @@ public class ReactExoplayerViewManager extends ViewGroupManager<ReactExoplayerVi 
            }

        } else {

            int identifier = context.getResources().getIdentifier(

                uriString,

                "drawable",

                context.getPackageName()

            );

            if (identifier == 0) {

                identifier = context.getResources().getIdentifier(

                    uriString,

                    "raw",

                    context.getPackageName()

                );

            }

            if (identifier > 0) {

                Uri srcUri = RawResourceDataSource.buildRawResourceUri(identifier);

                if (srcUri != null) {

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

+10 −2
Changes for android/src/main/java/com/brentvatne/react/ReactVideoView.java: 10 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -258,11 +258,19 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
                    }

                }

                if(fd==null) {

                    setRawData(mThemedReactContext.getResources().getIdentifier(

                    int identifier = mThemedReactContext.getResources().getIdentifier(

                        uriString,

                        "drawable",

                        mThemedReactContext.getPackageName()

                    );

                    if (identifier == 0) {

                        identifier = mThemedReactContext.getResources().getIdentifier(

                            uriString,

                            "raw",

                            mThemedReactContext.getPackageName()

                    ));

                        );

                    }

                    setRawData(identifier);

                }

                else {

                    setDataSource(fd.getFileDescriptor(), fd.getStartOffset(),fd.getLength());

example/android/app/src/main/java/com/videoplayer/MainApplication.java

+1 −11
Changes for example/android/app/src/main/java/com/videoplayer/MainApplication.java: 1 added line, 11 removed lines.
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ public class MainApplication extends Application implements ReactApplication { 


  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {

    @Override

        protected boolean getUseDeveloperSupport() {

    public boolean getUseDeveloperSupport() {

      return BuildConfig.DEBUG;

    }
@@ -29,16 +29,6 @@ public class MainApplication extends Application implements ReactApplication { 
    }

  };



    @Override



    protected List<ReactPackage> getPackages() {

      return Arrays.<ReactPackage>asList(

          new MainReactPackage(),

          new ReactVideoPackage()

      );

    }

  };



  @Override

  public ReactNativeHost getReactNativeHost() {

    return mReactNativeHost;

example/android/app/src/main/res/raw/broadchurch.mp4

deleted100644 → 0
−3.29 MiB

File deleted.

View file

example/index.android.js

+1 −2
Changes for example/index.android.js: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -105,9 +105,8 @@ class VideoPlayer extends Component { 
          <Video

            ref={(ref: Video) => { this.video = ref }}

            /* For ExoPlayer */

            /* source={require('./broadchurch.mp4')} */

            /* source={{ uri: 'http://www.youtube.com/api/manifest/dash/id/bf5bb2419360daf1/source/youtube?as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&ipbits=0&expire=19000000000&signature=51AF5F39AB0CEC3E5497CD9C900EBFEAECCCB5C7.8506521BFC350652163895D4C26DEE124209AA9E&key=ik0', type: 'mpd' }} */

            source={{ uri: 'broadchurch', type: 'mp4' }}

            source={require('./broadchurch.mp4')}

            style={styles.fullScreen}

            rate={this.state.rate}

            paused={this.state.paused}