From ecc84f119c5dc1faf6d17a1b4eb07ee0e1027caf Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 9 Apr 2025 07:37:23 +0200
Subject: [PATCH] Update versione JS XZing x barcode

---
 .../Pages/TestBarcodeReader.razor             | 56 ++++++++++++-------
 EgwCoreLib.BlazorTest/Program.cs              |  4 ++
 EgwCoreLib.Razor/BarcodeReader.razor.cs       |  3 +
 EgwCoreLib.Razor/EgwCoreLib.Razor.csproj      |  4 +-
 4 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/EgwCoreLib.BlazorTest/Pages/TestBarcodeReader.razor b/EgwCoreLib.BlazorTest/Pages/TestBarcodeReader.razor
index 07343cf..4c4ebe9 100644
--- a/EgwCoreLib.BlazorTest/Pages/TestBarcodeReader.razor
+++ b/EgwCoreLib.BlazorTest/Pages/TestBarcodeReader.razor
@@ -5,31 +5,39 @@
 <div class="card my-2">
     <div class="card-header"><h4>Test Barcode Reader</h4></div>
     <div class="card-body">
-        <BarcodeReader 
-                       @ref="barcodeReaderCustom"
-                       ScanResult="(e) => ScanDoneHandler(e)"
-                       ScanBtnTitle="Scan"
-                       ResetBtnTitle="Reset"
-                       CloseBtnTitle="Close"
-                       UseBuiltinDiv="false"
-                       SelectDeviceBtnTitle="Select Device">
-        </BarcodeReader>
+        @if (ShowScanBarcode)
+        {
+            <BarcodeReader 
+            @ref="barcodeReaderCustom"
+            ScanResult="(e) => ScanDoneHandler(e)"
+            ScanBtnTitle="Scan"
+            ResetBtnTitle="Reset"
+            CloseBtnTitle="Close"
+            UseBuiltinDiv="false"
+            SelectDeviceBtnTitle="Select Device">
+            </BarcodeReader>
 
-        <div @ref="barcodeReaderCustom.Element" class="d-flex justify-content-center">
-            <div class="col-12 col-md-8 col-lg-6">
-                <button class="btn btn-outline-success p-2 m-1 w-25" data-action="startButton">Scan</button>
-                <button class="btn btn-outline-success p-2 m-1 w-25" data-action="resetButton">Reset</button>
+            <div @ref="barcodeReaderCustom.Element" class="d-flex justify-content-center">
+                <div class="col-12 col-md-8 col-lg-6">
+                    <button class="btn btn-outline-success p-2 m-1 w-25" data-action="startButton">Scan</button>
+                    <button class="btn btn-outline-success p-2 m-1 w-25" data-action="resetButton">Reset</button>
+                    <button class="btn btn-outline-success p-2 m-1 w-25" @onclick="() => ToggleCodeScan()">Close</button>
 
-                <div data-action="sourceSelectPanel" style="display:none">
-                    <label for="sourceSelect">Source:</label>
-                    <select data-action="sourceSelect" style="max-width:100%" class="form-control">
-                    </select>
-                </div>
-                <div>
-                    <video id="video" playsinline="true" autoplay="true" class="w-100 h-100 border rounded shadow shadow-lg image-mirror" muted="true"></video>
+                    <div data-action="sourceSelectPanel" style="display:none">
+                        <label for="sourceSelect">Source:</label>
+                        <select data-action="sourceSelect" style="max-width:100%" class="form-control">
+                        </select>
+                    </div>
+                    <div>
+                        <video id="video" playsinline="true" autoplay="true" class="w-100 h-100 border rounded shadow shadow-lg image-mirror" muted="true"></video>
+                    </div>
                 </div>
             </div>
-        </div>
+        }
+        else
+        {
+            <button class="btn btn-outline-success p-2 m-1 w-25" @onclick="() => ToggleCodeScan()">Open</button>
+        }
     </div>
 </div>
 
@@ -48,4 +56,10 @@
     }
 
     protected string qrCodeVal { get; set; } = "https://office.egalware.com/WDC/UI";
+
+    protected void ToggleCodeScan()
+    {
+        ShowScanBarcode = !ShowScanBarcode;
+    }
+    private bool ShowScanBarcode = true;
 }
diff --git a/EgwCoreLib.BlazorTest/Program.cs b/EgwCoreLib.BlazorTest/Program.cs
index 14b7b33..a7dfe61 100644
--- a/EgwCoreLib.BlazorTest/Program.cs
+++ b/EgwCoreLib.BlazorTest/Program.cs
@@ -1,6 +1,7 @@
 using EgwCoreLib.BlazorTest;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Radzen;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -28,6 +29,9 @@ if (!app.Environment.IsDevelopment())
     app.UseHsts();
 }
 
+
+app.UsePathBase("/BlazorTest/");
+
 // disabilita risposta compressa in debug
 if (!app.Environment.IsDevelopment())
 {
diff --git a/EgwCoreLib.Razor/BarcodeReader.razor.cs b/EgwCoreLib.Razor/BarcodeReader.razor.cs
index d65730d..19492c3 100644
--- a/EgwCoreLib.Razor/BarcodeReader.razor.cs
+++ b/EgwCoreLib.Razor/BarcodeReader.razor.cs
@@ -172,6 +172,9 @@ namespace EgwCoreLib.Razor
             {
                 if (!firstRender) return;
                 Storage = new StorageService(JS);
+#if false
+                module = await JS.InvokeAsync<IJSObjectReference>("import", "./_content/EgwCoreLib.Razor/BarcodeReader.razor.js" + "?v=" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); 
+#endif
                 module = await JS.InvokeAsync<IJSObjectReference>("import", "./_content/EgwCoreLib.Razor/BarcodeReader.razor.js" + "?v=" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
                 Instance = DotNetObjectReference.Create(this);
                 if (Options == null)
diff --git a/EgwCoreLib.Razor/EgwCoreLib.Razor.csproj b/EgwCoreLib.Razor/EgwCoreLib.Razor.csproj
index 77bf6d2..b680d11 100644
--- a/EgwCoreLib.Razor/EgwCoreLib.Razor.csproj
+++ b/EgwCoreLib.Razor/EgwCoreLib.Razor.csproj
@@ -75,8 +75,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.36" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
     <PackageReference Include="System.Text.Encodings.Web" Version="6.0.1" />
-    <PackageReference Include="ZXing.Net" Version="0.16.9" />
-    <PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
+    <PackageReference Include="ZXing.Net" Version="0.16.10" />
+    <PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.13" />
   </ItemGroup>
 
   <ItemGroup>