feat: [Android] add playSoundOnRecord (#3065)

* add playSoundOnRecord * fix missing functions Co-authored-by: Tuan Luong <tuanluong@Tuans-MacBook-Pro.local> Co-authored-by: Mateus Andrade <15278828+MateusAndrade@users.noreply.github.com>
react-native-camera · Jan 8, 2021 · 19d6865 · 19d6865
1 parent 5b318c1
commit 19d6865
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 0 deletions.
diff --git a/android/src/main/java/com/google/android/cameraview/Camera1.java b/android/src/main/java/com/google/android/cameraview/Camera1.java
@@ -129,6 +129,8 @@ class Camera1 extends CameraViewImpl implements MediaRecorder.OnInfoListener,
 
     private Boolean mPlaySoundOnCapture = false;
 
+    private Boolean mPlaySoundOnRecord = false;
+
     private boolean mustUpdateSurface;
     private boolean surfaceWasDestroyed;
 
@@ -852,6 +854,9 @@ boolean record(String path, int maxDuration, int maxFileSize, boolean recordAudi
                 int deviceOrientation = displayOrientationToOrientationEnum(mDeviceOrientation);
                 mCallback.onRecordingStart(path, mOrientation != Constants.ORIENTATION_AUTO ? mOrientation : deviceOrientation, deviceOrientation);
 
+                if (mPlaySoundOnRecord) {
+                    sound.play(MediaActionSound.START_VIDEO_RECORDING);
+                }
 
                 return true;
             } catch (Exception e) {
@@ -1534,6 +1539,16 @@ public boolean getPlaySoundOnCapture(){
         return mPlaySoundOnCapture;
     }
 
+    @Override
+    void setPlaySoundOnRecord(boolean playSoundOnRecord) {
+        mPlaySoundOnRecord = playSoundOnRecord;
+    }
+
+    @Override
+    boolean getPlaySoundOnRecord() {
+        return mPlaySoundOnRecord;
+    }
+
     @Override
     public void onPreviewFrame(byte[] data, Camera camera) {
         Camera.Size previewSize = mCameraParameters.getPreviewSize();
@@ -1600,6 +1615,10 @@ private void stopMediaRecorder() {
 
             mCallback.onRecordingEnd();
 
+            if (mPlaySoundOnRecord) {
+                sound.play(MediaActionSound.STOP_VIDEO_RECORDING);
+            }
+
             int deviceOrientation = displayOrientationToOrientationEnum(mDeviceOrientation);
 
             if (mVideoPath == null || !new File(mVideoPath).exists()) {

diff --git a/android/src/main/java/com/google/android/cameraview/Camera2.java b/android/src/main/java/com/google/android/cameraview/Camera2.java
@@ -268,6 +268,8 @@ public void onImageAvailable(ImageReader reader) {
 
     private Boolean mPlaySoundOnCapture = false;
 
+    private Boolean mPlaySoundOnRecord = false;
+
     private Surface mPreviewSurface;
 
     private Rect mInitialCropRegion;
@@ -598,6 +600,9 @@ boolean record(String path, int maxDuration, int maxFileSize, boolean recordAudi
                 // same TODO as onVideoRecorded
                 mCallback.onRecordingStart(mVideoPath, 0, 0);
 
+                if (mPlaySoundOnRecord) {
+                    sound.play(MediaActionSound.START_VIDEO_RECORDING);
+                }
                 return true;
             } catch (CameraAccessException | IOException e) {
                 e.printStackTrace();
@@ -709,6 +714,16 @@ public boolean getPlaySoundOnCapture(){
         return mPlaySoundOnCapture;
     }
 
+    @Override
+    void setPlaySoundOnRecord(boolean playSoundOnRecord) {
+        mPlaySoundOnRecord = playSoundOnRecord;
+    }
+
+    @Override
+    boolean getPlaySoundOnRecord() {
+        return mPlaySoundOnRecord;
+    }
+
     @Override
     void setScanning(boolean isScanning) {
         if (mIsScanning == isScanning) {
@@ -1428,6 +1443,9 @@ private void stopMediaRecorder() {
         mMediaRecorder = null;
 
         mCallback.onRecordingEnd();
+        if (mPlaySoundOnRecord) {
+            sound.play(MediaActionSound.STOP_VIDEO_RECORDING);
+        }
 
         if (mVideoPath == null || !new File(mVideoPath).exists()) {
             // @TODO: implement videoOrientation and deviceOrientation calculation

diff --git a/android/src/main/java/com/google/android/cameraview/CameraView.java b/android/src/main/java/com/google/android/cameraview/CameraView.java
@@ -257,6 +257,7 @@ protected Parcelable onSaveInstanceState() {
         state.zoom = getZoom();
         state.whiteBalance = getWhiteBalance();
         state.playSoundOnCapture = getPlaySoundOnCapture();
+        state.playSoundOnRecord = getPlaySoundOnRecord();
         state.scanning = getScanning();
         state.pictureSize = getPictureSize();
         return state;
@@ -280,6 +281,7 @@ protected void onRestoreInstanceState(Parcelable state) {
         setZoom(ss.zoom);
         setWhiteBalance(ss.whiteBalance);
         setPlaySoundOnCapture(ss.playSoundOnCapture);
+        setPlaySoundOnRecord(ss.playSoundOnRecord);
         setScanning(ss.scanning);
         setPictureSize(ss.pictureSize);
     }
@@ -604,6 +606,14 @@ public boolean getPlaySoundOnCapture() {
       return mImpl.getPlaySoundOnCapture();
     }
 
+    public void setPlaySoundOnRecord(boolean playSoundOnRecord) {
+        mImpl.setPlaySoundOnRecord(playSoundOnRecord);
+    }
+
+    public boolean getPlaySoundOnRecord() {
+        return mImpl.getPlaySoundOnRecord();
+    }
+
     public void setScanning(boolean isScanning) { mImpl.setScanning(isScanning);}
 
     public boolean getScanning() { return mImpl.getScanning(); }
@@ -765,6 +775,8 @@ protected static class SavedState extends BaseSavedState {
 
         boolean playSoundOnCapture;
 
+        boolean playSoundOnRecord;
+
         boolean scanning;
 
         Size pictureSize;
@@ -782,6 +794,7 @@ public SavedState(Parcel source, ClassLoader loader) {
             zoom = source.readFloat();
             whiteBalance = source.readInt();
             playSoundOnCapture = source.readByte() != 0;
+            playSoundOnRecord = source.readByte() != 0;
             scanning = source.readByte() != 0;
             pictureSize = source.readParcelable(loader);
         }
@@ -803,6 +816,7 @@ public void writeToParcel(Parcel out, int flags) {
             out.writeFloat(zoom);
             out.writeInt(whiteBalance);
             out.writeByte((byte) (playSoundOnCapture ? 1 : 0));
+            out.writeByte((byte) (playSoundOnRecord ? 1 : 0));
             out.writeByte((byte) (scanning ? 1 : 0));
             out.writeParcelable(pictureSize, flags);
         }

diff --git a/android/src/main/java/com/google/android/cameraview/CameraViewImpl.java b/android/src/main/java/com/google/android/cameraview/CameraViewImpl.java
@@ -135,6 +135,10 @@ abstract boolean record(String path, int maxDuration, int maxFileSize,
 
     abstract boolean getPlaySoundOnCapture();
 
+    abstract void setPlaySoundOnRecord(boolean playSoundOnRecord);
+
+    abstract boolean getPlaySoundOnRecord();
+
     abstract void setScanning(boolean isScanning);
 
     abstract boolean getScanning();

diff --git a/android/src/main/java/org/reactnative/camera/CameraViewManager.java b/android/src/main/java/org/reactnative/camera/CameraViewManager.java
@@ -140,6 +140,11 @@ public void setPlaySoundOnCapture(RNCameraView view, boolean playSoundOnCapture)
     view.setPlaySoundOnCapture(playSoundOnCapture);
   }
 
+  @ReactProp(name = "playSoundOnRecord")
+  public void setPlaySoundOnRecord(RNCameraView view, boolean playSoundOnRecord) {
+    view.setPlaySoundOnRecord(playSoundOnRecord);
+  }
+
   @ReactProp(name = "barCodeTypes")
   public void setBarCodeTypes(RNCameraView view, ReadableArray barCodeTypes) {
     if (barCodeTypes == null) {

diff --git a/docs/RNCamera.md b/docs/RNCamera.md
@@ -356,6 +356,10 @@ An `{width:, height: }` object which defines the width and height of the cameraV
 
 Boolean to turn on or off the camera's shutter sound (default false). Note that in some countries, the shutter sound cannot be turned off.
 
+### `Android` `playSoundOnRecord`
+
+Boolean to turn on or off the camera's record sound (default false)
+
 ### `iOS` `videoStabilizationMode`
 
 The video stabilization mode used for a video recording. The possible values are:

diff --git a/src/RNCamera.js b/src/RNCamera.js
@@ -283,6 +283,7 @@ type PropsType = typeof View.props & {
   keepAudioSession?: boolean,
   useCamera2Api?: boolean,
   playSoundOnCapture?: boolean,
+  playSoundOnRecord?: boolean,
   videoStabilizationMode?: number | string,
   pictureSize?: string,
   rectOfInterest: Rect,
@@ -442,6 +443,7 @@ export default class Camera extends React.Component<PropsType, StateType> {
     keepAudioSession: PropTypes.bool,
     useCamera2Api: PropTypes.bool,
     playSoundOnCapture: PropTypes.bool,
+    playSoundOnRecord: PropTypes.bool,
     videoStabilizationMode: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     pictureSize: PropTypes.string,
     mirrorVideo: PropTypes.bool,
@@ -487,6 +489,7 @@ export default class Camera extends React.Component<PropsType, StateType> {
     keepAudioSession: false,
     useCamera2Api: false,
     playSoundOnCapture: false,
+    playSoundOnRecord: false,
     pictureSize: 'None',
     videoStabilizationMode: 0,
     mirrorVideo: false,

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -248,6 +248,8 @@ export interface RNCameraProps {
   permissionDialogMessage?: string;
   /** Android only */
   playSoundOnCapture?: boolean;
+  /** Android only */
+  playSoundOnRecord?: boolean;
 
   androidCameraPermissionOptions?: {
     title: string;