Merge pull request #23 from Redth/ios-lock-config

Fix iOS Scanning and Torch default
Redth · Aug 7, 2022 · 67a31c3 · 67a31c3
2 parents fe68ff0 + 158d6fa
commit 67a31c3
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 12 deletions.
diff --git a/ZXing.Net.MAUI/Apple/CameraManager.ios.maccatalyst.cs b/ZXing.Net.MAUI/Apple/CameraManager.ios.maccatalyst.cs
@@ -136,14 +136,49 @@ public void UpdateCamera()
 
 		public void Disconnect()
 		{
-			captureSession.RemoveOutput(videoDataOutput);
-			captureSession.StopRunning();
+			if (captureSession != null)
+			{
+				if (captureSession.Running)
+					captureSession.StopRunning();
+
+				captureSession.RemoveOutput(videoDataOutput);
+
+				// Cleanup old input
+				if (captureInput != null && captureSession.Inputs.Length > 0 && captureSession.Inputs.Contains(captureInput))
+				{
+					captureSession.RemoveInput(captureInput);
+					captureInput.Dispose();
+					captureInput = null;
+				}
+
+				// Cleanup old device
+				if (captureDevice != null)
+				{
+					captureDevice.Dispose();
+					captureDevice = null;
+				}
+			}
 		}
 
 		public void UpdateTorch(bool on)
 		{
 			if (captureDevice != null && captureDevice.HasTorch && captureDevice.TorchAvailable)
-				captureDevice.TorchMode = on ? AVCaptureTorchMode.On : AVCaptureTorchMode.Off;
+			{
+				var isOn = captureDevice?.TorchActive ?? false;
+
+				try
+				{
+					if (on != isOn)
+					{
+						CaptureDevicePerformWithLockedConfiguration(() =>
+							captureDevice.TorchMode = on ? AVCaptureTorchMode.On : AVCaptureTorchMode.Off);
+                    }
+				}
+				catch (Exception ex)
+				{
+					Console.WriteLine(ex);
+				}
+			}
 		}
 
 		public void Focus(Microsoft.Maui.Graphics.Point point)
@@ -158,12 +193,25 @@ public void Focus(Microsoft.Maui.Graphics.Point point)
 			//See if it supports focusing on a point
 			if (captureDevice.FocusPointOfInterestSupported && !captureDevice.AdjustingFocus)
 			{
-				//Lock device to config
-				if (captureDevice.LockForConfiguration(out var err))
+				CaptureDevicePerformWithLockedConfiguration(() =>
 				{
 					//Focus at the point touched
 					captureDevice.FocusPointOfInterest = point;
-					captureDevice.FocusMode = AVCaptureFocusMode.ContinuousAutoFocus;
+					captureDevice.FocusMode = focusMode;
+				});
+			}
+		}
+
+		void CaptureDevicePerformWithLockedConfiguration(Action handler)
+		{
+			if (captureDevice.LockForConfiguration(out var err))
+			{
+				try
+				{
+					handler();
+				}
+				finally
+				{
 					captureDevice.UnlockForConfiguration();
 				}
 			}
@@ -178,14 +226,12 @@ public void AutoFocus()
 			if (captureDevice.IsFocusModeSupported(AVCaptureFocusMode.ContinuousAutoFocus))
 				focusMode = AVCaptureFocusMode.ContinuousAutoFocus;
 
-			//Lock device to config
-			if (captureDevice.LockForConfiguration(out var err))
+			CaptureDevicePerformWithLockedConfiguration(() =>
 			{
 				if (captureDevice.FocusPointOfInterestSupported)
 					captureDevice.FocusPointOfInterest = CoreGraphics.CGPoint.Empty;
 				captureDevice.FocusMode = focusMode;
-				captureDevice.UnlockForConfiguration();
-			}
+			});
 		}
 
 		public void Dispose()

diff --git a/ZXing.Net.MAUI/Controls/CameraBarcodeReaderView.cs b/ZXing.Net.MAUI/Controls/CameraBarcodeReaderView.cs
@@ -56,7 +56,7 @@ void Handler_FrameReady(object sender, CameraFrameBufferEventArgs e)
 			=> FrameReady?.Invoke(this, e);
 
 		public static readonly BindableProperty IsTorchOnProperty =
-			BindableProperty.Create(nameof(IsTorchOn), typeof(bool), typeof(CameraBarcodeReaderView), defaultValue: true);
+			BindableProperty.Create(nameof(IsTorchOn), typeof(bool), typeof(CameraBarcodeReaderView), defaultValue: false);
 
 		public bool IsTorchOn
 		{

diff --git a/ZXing.Net.MAUI/ZXing.Net.MAUI.csproj b/ZXing.Net.MAUI/ZXing.Net.MAUI.csproj
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>net6.0-android;net6.0-maccatalyst;net6.0-ios</TargetFrameworks>
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
-		<PackageId>ZXing.Net.Maui</PackageId>
+		<PackageId>Redth.ZXing.Net.Maui</PackageId>
 		<Title>ZXing.Net.MAUI Barcode Scanner for .NET MAUI</Title>
 		<Authors>Redth</Authors>
 		<UseMaui>True</UseMaui>