Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

[Bug] Fixed CameraView crash on FlashMode Torch #1522

Merged
merged 3 commits into from
Jul 27, 2021
Merged

[Bug] Fixed CameraView crash on FlashMode Torch #1522

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2e46f6
Update FormsCameraView.ios.cs
GUOLDEV Jul 21, 2021
8b4be64
Update src/CommunityToolkit/Xamarin.CommunityToolkit/Views/CameraView…
GUOLDEV Jul 22, 2021
e6cb125
Merge branch 'develop' into guoldev/cameraview_torch_crash
AndreiMisiukevich Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/CommunityToolkit/Xamarin.CommunityToolkit/Views/CameraView/iOS/FormsCameraView.ios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public async Task TakePhoto()
photoOutputConnection.VideoOrientation = previewLayer.Connection?.VideoOrientation ?? throw new NullReferenceException();

var photoSettings = AVCapturePhotoSettings.Create();
photoSettings.FlashMode = (AVCaptureFlashMode)flashMode;
photoSettings.FlashMode = GetFlashMode();
photoSettings.IsHighResolutionPhotoEnabled = true;

var photoCaptureDelegate = new PhotoCaptureDelegate
Expand Down Expand Up @@ -239,6 +239,21 @@ public async Task TakePhoto()
}
}

AVCaptureFlashMode GetFlashMode()
{
switch (flashMode)
{
case CameraFlashMode.On:
case CameraFlashMode.Torch:
return AVCaptureFlashMode.On;
case CameraFlashMode.Auto:
return AVCaptureFlashMode.Auto;
case CameraFlashMode.Off:
default:
return AVCaptureFlashMode.Off;
}
}

string ConstructVideoFilename()
{
var documents = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
Expand Down Expand Up @@ -605,4 +620,4 @@ public void DidFinishProcessingPhoto(AVCapturePhotoOutput captureOutput, CMSampl
public void DidFinishCapture(AVCapturePhotoOutput captureOutput, AVCaptureResolvedPhotoSettings resolvedSettings, NSError error)
=> OnFinishCapture?.Invoke(photoData, error);
}
}
}