bluewallet/react-native-camera
bluewallet/react-native-camera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(android): prevent shutting down camera when re-mounting children (#1995)

Browse Source 
* fix(android): prevent shutting down camera when re-mounting children

* fix: render children outside of native component
This commit is contained in:
Michał Pierzchała 2019-01-08 11:48:54 +01:00 committed by Sibelius Seraphini
parent c7336b2ff4
commit 5695f5d066
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
android/src/main/java/org/reactnative/camera/RNCameraView.java
View File

@ -214,15 +214,6 @@ public class RNCameraView extends CameraView implements LifecycleEventListener,
// React handles this for us, so we don't need to call super.requestLayout();
}
@Override
public void onViewAdded(View child) {
if (this.getView() == child || this.getView() == null) return;
// remove and read view to make sure it is in the back.
// @TODO figure out why there was a z order issue in the first place and fix accordingly.
this.removeView(this.getView());
this.addView(this.getView(), 0);
}
public void setBarCodeTypes(List<String> barCodeTypes) {
mBarCodeTypes = barCodeTypes;
initBarcodeReader();

9
examples/basic/App.js
View File

@ -182,6 +182,9 @@ export default class CameraScreen extends React.Component {
)}
</TouchableOpacity>
</View>
{this.state.zoom !== 0 && (
<Text style={[styles.flipText, styles.zoomText]}>Zoom: {this.state.zoom}</Text>
)}
<View
style={{
flex: 0.1,
@ -247,6 +250,12 @@ const styles = StyleSheet.create({
color: 'white',
fontSize: 15,
},
zoomText: {
position: 'absolute',
bottom: 70,
zIndex: 2,
left: 2,
},
picButton: {
backgroundColor: 'darkseagreen',
},

32
src/RNCamera.js
View File

@ -447,25 +447,27 @@ export default class Camera extends React.Component<PropsType, StateType> {
};
render() {
const nativeProps = this._convertNativeProps(this.props);
const { style, ...nativeProps } = this._convertNativeProps(this.props);
if (this.state.isAuthorized || this.hasFaCC()) {
return (
<RNCamera
{...nativeProps}
ref={this._setReference}
onMountError={this._onMountError}
onCameraReady={this._onCameraReady}
onGoogleVisionBarcodesDetected={this._onObjectDetected(
this.props.onGoogleVisionBarcodesDetected,
)}
onBarCodeRead={this._onObjectDetected(this.props.onBarCodeRead)}
onFacesDetected={this._onObjectDetected(this.props.onFacesDetected)}
onTextRecognized={this._onObjectDetected(this.props.onTextRecognized)}
onPictureSaved={this._onPictureSaved}
>
<View style={style}>
<RNCamera
{...nativeProps}
style={StyleSheet.absoluteFill}
ref={this._setReference}
onMountError={this._onMountError}
onCameraReady={this._onCameraReady}
onGoogleVisionBarcodesDetected={this._onObjectDetected(
this.props.onGoogleVisionBarcodesDetected,
)}
onBarCodeRead={this._onObjectDetected(this.props.onBarCodeRead)}
onFacesDetected={this._onObjectDetected(this.props.onFacesDetected)}
onTextRecognized={this._onObjectDetected(this.props.onTextRecognized)}
onPictureSaved={this._onPictureSaved}
/>
{this.renderChildren()}
</RNCamera>
</View>
);
} else if (!this.state.isAuthorizationChecked) {
return this.props.pendingAuthorizationView;