1.2.4

afriscic · Jan 24, 2024 · 955a411 · 955a411
1 parent f2f20d1
commit 955a411
Show file tree

Hide file tree

Showing 5 changed files with 159 additions and 129 deletions.
diff --git a/BarcodeScanning.Native.Maui/BarcodeScanning.Native.Maui.csproj b/BarcodeScanning.Native.Maui/BarcodeScanning.Native.Maui.csproj
@@ -5,7 +5,7 @@
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Version>1.2.3</Version>
+		<Version>1.2.4</Version>
 		<Authors>Alen Friščić</Authors>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -28,9 +28,9 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
-		<PackageReference Include="Xamarin.Google.MLKit.BarcodeScanning" Version="117.2.0.2" />
-		<PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.0.1" />
-		<PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.0.1" />
+		<PackageReference Include="Xamarin.Google.MLKit.BarcodeScanning" Version="117.2.0.3" />
+		<PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.1" />
+		<PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.1" />
 
 		<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.3.0.2" />
 	</ItemGroup>

diff --git a/BarcodeScanning.Native.Maui/Platforms/Android/BarcodeAnalyzer.cs b/BarcodeScanning.Native.Maui/Platforms/Android/BarcodeAnalyzer.cs
@@ -15,14 +15,14 @@ internal class BarcodeAnalyzer : Java.Lang.Object, ImageAnalysis.IAnalyzer
 
     private readonly IBarcodeScanner _barcodeScanner;
     private readonly CameraView _cameraView;
-    private readonly PreviewView _previewView;
     private readonly CameraViewHandler _cameraViewHandler;
+    private readonly PreviewView _previewView;
 
     internal BarcodeAnalyzer(CameraView cameraView, PreviewView previewView, CameraViewHandler cameraViewHandler)
     {
         _cameraView = cameraView;
-        _previewView = previewView;
         _cameraViewHandler = cameraViewHandler;
+        _previewView = previewView;
 
         _barcodeScanner = Xamarin.Google.MLKit.Vision.BarCode.BarcodeScanning.GetClient(new BarcodeScannerOptions.Builder()
             .SetBarcodeFormats(Methods.ConvertBarcodeFormats(_cameraView.BarcodeSymbologies))
@@ -82,31 +82,20 @@ public async void Analyze(IImageProxy proxy)
 
             if (_barcodeResults is not null && _cameraView is not null)
                 _cameraView.DetectionFinished(_barcodeResults);
-        }
-        catch (Java.Lang.Exception)
-        {
-
         }
         catch (Exception)
         {
-
         }
         finally
         {
-            SafeCloseImageProxy(proxy, _cameraViewHandler);
-        }
-    }
-
-    private static void SafeCloseImageProxy(IImageProxy proxy, CameraViewHandler cameraViewHandler)
-    {
-        try
-        {
-            proxy?.Close();
-        }
-        catch (Exception)
-        {
-            MainThread.BeginInvokeOnMainThread(() => cameraViewHandler.Start());
+            try
+            {
+                proxy?.Close();
+            }
+            catch (Exception) 
+            {
+                MainThread.BeginInvokeOnMainThread(_cameraViewHandler.Start);
+            }
         }
-    }
-
-}
+    } 
+}
diff --git a/BarcodeScanning.Native.Maui/Platforms/Android/CameraViewHandler.cs b/BarcodeScanning.Native.Maui/Platforms/Android/CameraViewHandler.cs
@@ -17,7 +17,7 @@ public partial class CameraViewHandler
     private PreviewView _previewView;
 
     private readonly int _delay = 200;
-    private bool _cameraStarted = false;
+    private bool _cameraRunning = false;
 
     protected override BarcodeView CreatePlatformView()
     {
@@ -40,11 +40,12 @@ protected override BarcodeView CreatePlatformView()
         return _barcodeView;
     }
 
-    public void Start()
-    {
+    internal void Start()
+    { 
         if (_cameraController is not null)
         {
             _cameraController.Unbind();
+            _cameraRunning = false;
 
             ILifecycleOwner lifecycleOwner = null;
             if (Context is ILifecycleOwner)
@@ -57,10 +58,15 @@ public void Start()
             if (lifecycleOwner is null)
                 return;
 
+            if (_cameraController.CameraSelector is null)
+                UpdateCamera();
+            if (_cameraController.ImageAnalysisTargetSize is null)
+                UpdateResolution();
+
             UpdateAnalyzer();
 
             _cameraController.BindToLifecycle(lifecycleOwner);
-            _cameraStarted = true;
+            _cameraRunning = true;
         }
     }
 
@@ -70,7 +76,7 @@ private void Stop()
         {
             _cameraController.EnableTorch(false);
             _cameraController.Unbind();
-            _cameraStarted = false;
+            _cameraRunning = false;
         }
     }
 
@@ -117,12 +123,14 @@ private void UpdateCamera()
 
     }
 
+    //TODO Implement setImageAnalysisResolutionSelector
+    //https://developer.android.com/reference/androidx/camera/view/CameraController#setImageAnalysisResolutionSelector(androidx.camera.core.resolutionselector.ResolutionSelector)
     private void UpdateResolution()
     {
         if (_cameraController is not null)
             _cameraController.ImageAnalysisTargetSize = new CameraController.OutputSize(Methods.TargetResolution(VirtualView?.CaptureQuality));
 
-        if (_cameraStarted)
+        if (_cameraRunning)
             Start();
     }
 

diff --git a/BarcodeScanning.Native.Maui/Platforms/iOS/BarcodeAnalyzer.cs b/BarcodeScanning.Native.Maui/Platforms/iOS/BarcodeAnalyzer.cs
@@ -8,17 +8,20 @@ internal class BarcodeAnalyzer : AVCaptureVideoDataOutputSampleBufferDelegate
 {
     private readonly AVCaptureVideoPreviewLayer _previewLayer;
     private readonly CameraView _cameraView;
+    private readonly CameraViewHandler _cameraViewHandler;
     private readonly VNDetectBarcodesRequest _barcodeRequest;
     private readonly VNSequenceRequestHandler _sequenceRequestHandler;
 
     private HashSet<BarcodeResult> _barcodeResults;
 
-    internal BarcodeAnalyzer(CameraView cameraView, AVCaptureVideoPreviewLayer previewLayer)
+    internal BarcodeAnalyzer(CameraView cameraView, AVCaptureVideoPreviewLayer previewLayer, CameraViewHandler cameraViewHandler)
     {
         _cameraView = cameraView;
+        _cameraViewHandler = cameraViewHandler;
         _previewLayer = previewLayer;
         _sequenceRequestHandler = new VNSequenceRequestHandler();
-        _barcodeRequest = new VNDetectBarcodesRequest((request, error) => {
+        _barcodeRequest = new VNDetectBarcodesRequest((request, error) => 
+        {
             if (error is null)
                 _barcodeResults = Methods.ProcessBarcodeResult(request.GetResults<VNBarcodeObservation>(), _previewLayer);
         });
@@ -64,23 +67,17 @@ public override void DidOutputSampleBuffer(AVCaptureOutput captureOutput, CMSamp
         }
         catch (Exception)
         {
-
         }
         finally
         {
-            SafeCloseSampleBuffer(sampleBuffer);
-        }
-    }
-
-    private static void SafeCloseSampleBuffer(CMSampleBuffer buffer)
-    {
-        try
-        {
-            buffer?.Dispose();
-        }
-        catch (Exception)
-        {
-
+            try
+            {
+                sampleBuffer?.Dispose();
+            }
+            catch (Exception)
+            {
+                MainThread.BeginInvokeOnMainThread(_cameraViewHandler.Start);
+            }
         }
     }
 }