KazukyAkayashi/m3_lightmeter
KazukyAkayashi/m3_lightmeter
1
0
Fork 0
mirror of https://github.com/vodemn/m3_lightmeter.git synced 2024-11-24 08:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

ML-74 CameraContainerBloc crashes (#75)

Browse source 
* nullable var instead of `late`

* `.then((_) => _cameraController = null));`
This commit is contained in:
Vadim 2023-05-21 11:50:46 +02:00 committed by GitHub
parent ba0d6d3fab
commit c63b5a420d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lib/screens/metering/components/camera_container/bloc_container_camera.dart
View file

@ -23,7 +23,7 @@ import 'package:lightmeter/utils/log_2.dart';
class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraContainerState> { class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraContainerState> {
final MeteringInteractor _meteringInteractor; final MeteringInteractor _meteringInteractor;
late final _WidgetsBindingObserver _observer; late final _WidgetsBindingObserver _observer;
late CameraController _cameraController; CameraController? _cameraController;
static const _maxZoom = 7.0; static const _maxZoom = 7.0;
RangeValues? _zoomRange; RangeValues? _zoomRange;
@ -60,7 +60,7 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
@override @override
Future<void> close() async { Future<void> close() async {
WidgetsBinding.instance.removeObserver(_observer); WidgetsBinding.instance.removeObserver(_observer);
unawaited(_cameraController.dispose()); unawaited(_cameraController?.dispose().then((_) => _cameraController = null));
communicationBloc.add(communication_event.MeteringEndedEvent(_ev100)); communicationBloc.add(communication_event.MeteringEndedEvent(_ev100));
return super.close(); return super.close();
} }
@ -118,30 +118,30 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
enableAudio: false, enableAudio: false,
); );
await _cameraController.initialize(); await _cameraController!.initialize();
await _cameraController.setFlashMode(FlashMode.off); await _cameraController!.setFlashMode(FlashMode.off);
_zoomRange = await Future.wait<double>([ _zoomRange = await Future.wait<double>([
_cameraController.getMinZoomLevel(), _cameraController!.getMinZoomLevel(),
_cameraController.getMaxZoomLevel(), _cameraController!.getMaxZoomLevel(),
]).then((levels) => RangeValues(levels[0], math.min(_maxZoom, levels[1]))); ]).then((levels) => RangeValues(levels[0], math.min(_maxZoom, levels[1])));
_currentZoom = _zoomRange!.start; _currentZoom = _zoomRange!.start;
_exposureOffsetRange = await Future.wait<double>([ _exposureOffsetRange = await Future.wait<double>([
_cameraController.getMinExposureOffset(), _cameraController!.getMinExposureOffset(),
_cameraController.getMaxExposureOffset(), _cameraController!.getMaxExposureOffset(),
]).then( ]).then(
(levels) => RangeValues( (levels) => RangeValues(
math.max(_exposureMaxRange.start, levels[0]), math.max(_exposureMaxRange.start, levels[0]),
math.min(_exposureMaxRange.end, levels[1]), math.min(_exposureMaxRange.end, levels[1]),
), ),
); );
await _cameraController.getExposureOffsetStepSize().then((value) { await _cameraController!.getExposureOffsetStepSize().then((value) {
_exposureStep = value == 0 ? 0.1 : value; _exposureStep = value == 0 ? 0.1 : value;
}); });
_currentExposureOffset = 0.0; _currentExposureOffset = 0.0;
emit(CameraInitializedState(_cameraController)); emit(CameraInitializedState(_cameraController!));
_emitActiveState(emit); _emitActiveState(emit);
} catch (e) { } catch (e) {
@ -151,20 +151,24 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
Future<void> _onDeinitialize(DeinitializeEvent _, Emitter emit) async { Future<void> _onDeinitialize(DeinitializeEvent _, Emitter emit) async {
emit(const CameraLoadingState()); emit(const CameraLoadingState());
unawaited(_cameraController.dispose()); unawaited(_cameraController?.dispose().then((_) => _cameraController = null));
} }
Future<void> _onZoomChanged(ZoomChangedEvent event, Emitter emit) async { Future<void> _onZoomChanged(ZoomChangedEvent event, Emitter emit) async {
_cameraController.setZoomLevel(event.value); if (_cameraController != null) {
_cameraController!.setZoomLevel(event.value);
_currentZoom = event.value; _currentZoom = event.value;
_emitActiveState(emit); _emitActiveState(emit);
} }
}
Future<void> _onExposureOffsetChanged(ExposureOffsetChangedEvent event, Emitter emit) async { Future<void> _onExposureOffsetChanged(ExposureOffsetChangedEvent event, Emitter emit) async {
_cameraController.setExposureOffset(event.value); if (_cameraController != null) {
_cameraController!.setExposureOffset(event.value);
_currentExposureOffset = event.value; _currentExposureOffset = event.value;
_emitActiveState(emit); _emitActiveState(emit);
} }
}
Future<void> _onExposureOffsetResetEvent(ExposureOffsetResetEvent event, Emitter emit) async { Future<void> _onExposureOffsetResetEvent(ExposureOffsetResetEvent event, Emitter emit) async {
_meteringInteractor.quickVibration(); _meteringInteractor.quickVibration();
@ -183,12 +187,13 @@ class CameraContainerBloc extends EvSourceBlocBase<CameraContainerEvent, CameraC
); );
} }
bool get _canTakePhoto => bool get _canTakePhoto => !(_cameraController == null ||
!(!_cameraController.value.isInitialized || _cameraController.value.isTakingPicture); !_cameraController!.value.isInitialized ||
_cameraController!.value.isTakingPicture);
Future<double?> _takePhoto() async { Future<double?> _takePhoto() async {
try { try {
final file = await _cameraController.takePicture(); final file = await _cameraController!.takePicture();
final Uint8List bytes = await file.readAsBytes(); final Uint8List bytes = await file.readAsBytes();
Directory(file.path).deleteSync(recursive: true); Directory(file.path).deleteSync(recursive: true);