diff --git a/Anyline Windows UWP Examples/Anyline Windows UWP Examples.csproj b/Anyline Windows UWP Examples/Anyline Windows UWP Examples.csproj index d52c3ac..fc7b838 100644 --- a/Anyline Windows UWP Examples/Anyline Windows UWP Examples.csproj +++ b/Anyline Windows UWP Examples/Anyline Windows UWP Examples.csproj @@ -41,52 +41,6 @@ true false - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x64 - false - prompt - true - - - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x64 - false - prompt - true - true - @@ -190,7 +144,7 @@ False ..\Anyline.winmd - + False ..\AnylineSDK.dll diff --git a/Anyline Windows UWP Examples/MainPage.xaml.cs b/Anyline Windows UWP Examples/MainPage.xaml.cs index 548a8e4..96ca989 100644 --- a/Anyline Windows UWP Examples/MainPage.xaml.cs +++ b/Anyline Windows UWP Examples/MainPage.xaml.cs @@ -118,9 +118,6 @@ public void OnSelectionChanged(object sender, SelectionChangedEventArgs args) case Model.UseCase.SerialNumbers: Frame.Navigate(typeof(Modules.Energy.ScanEnergy), "serialnumber"); break; - case Model.UseCase.SerialNumberAlphaNumeric3Letters: - Frame.Navigate(typeof(Modules.Energy.ScanEnergy), "serialnumber3al"); - break; case Model.UseCase.DialMeter: Frame.Navigate(typeof(Modules.Energy.ScanEnergy), "dial"); break; diff --git a/Anyline Windows UWP Examples/Model/Entry.cs b/Anyline Windows UWP Examples/Model/Entry.cs index ea098d1..e557c00 100644 --- a/Anyline Windows UWP Examples/Model/Entry.cs +++ b/Anyline Windows UWP Examples/Model/Entry.cs @@ -9,7 +9,6 @@ public enum UseCase MRZScan, PhotoMode, SerialNumbers, - SerialNumberAlphaNumeric3Letters, DialMeter, DotMatrixMeter } diff --git a/Anyline Windows UWP Examples/Model/ExampleList.cs b/Anyline Windows UWP Examples/Model/ExampleList.cs index 697a1b8..b43f80f 100644 --- a/Anyline Windows UWP Examples/Model/ExampleList.cs +++ b/Anyline Windows UWP Examples/Model/ExampleList.cs @@ -82,14 +82,6 @@ public ExampleList() IconSource = "ms-appx:///Assets/Images/icon_mrz.png", UseCase = UseCase.SerialNumbers }, - new Entry - { - Name ="Serial Numbers (with 3 Letter Prefix)", - Description ="Scan serial numbers with 3-letter alphanumeric prefix", - BackgroundSource = "ms-appx:///Assets/Images/digital.png", - IconSource = "ms-appx:///Assets/Images/icon_mrz.png", - UseCase = UseCase.SerialNumberAlphaNumeric3Letters - }, // Barcode new Entry { Name="Barcode" }, diff --git a/Anyline Windows UWP Examples/Modules/Energy/ScanEnergy.xaml.cs b/Anyline Windows UWP Examples/Modules/Energy/ScanEnergy.xaml.cs index 4bf8a43..23cd6b9 100644 --- a/Anyline Windows UWP Examples/Modules/Energy/ScanEnergy.xaml.cs +++ b/Anyline Windows UWP Examples/Modules/Energy/ScanEnergy.xaml.cs @@ -127,9 +127,12 @@ protected override void OnNavigatedTo(NavigationEventArgs args) break; case "serialnumber": AnylineScanView.SetScanMode(EnergyScanView.ScanMode.SerialNumber); - break; - case "serialnumber3al": - AnylineScanView.SetScanMode(EnergyScanView.ScanMode.SerialNumberAlphaNumeric3Letters); + + // we can optionally set a character whitelist and a regular expression + // for the SerialNumber scan mode + AnylineScanView.SetSerialNumberCharWhitelist("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + AnylineScanView.SetSerialNumberValidationRegex("^[A-Z0-9]{5,}$"); + break; case "dial": AnylineScanView.SetScanMode(EnergyScanView.ScanMode.DialMeter); diff --git a/Anyline.dll b/Anyline.dll index 7a86c4d..9e85867 100644 --- a/Anyline.dll +++ b/Anyline.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3caf1fba09beb093b1ac01aadb14c7ebcc7980071bebdc7b946d2e67adf78dc9 -size 39890432 +oid sha256:5696d3f46f41b5c9e509c502ce912a8a171104abf2ded39aacb941462507647a +size 39894528 diff --git a/Anyline.winmd b/Anyline.winmd index f686735..d156e61 100644 Binary files a/Anyline.winmd and b/Anyline.winmd differ diff --git a/AnylineSDK.dll b/AnylineSDK.dll index 2b363ba..140b904 100644 --- a/AnylineSDK.dll +++ b/AnylineSDK.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01808fa07d2705061e0eaaa34bcd697eeda018f14c33fd2d84f032e89e746230 -size 3866112 +oid sha256:e1f10e641467f1b484883f835285805b4f675cbc660dc0c0bfd948005a646913 +size 4346880 diff --git a/anylineexamples-windows-uwp.sln b/anylineexamples-windows-uwp.sln index 7df46a0..ffa580d 100644 --- a/anylineexamples-windows-uwp.sln +++ b/anylineexamples-windows-uwp.sln @@ -15,21 +15,13 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Debug|ARM.ActiveCfg = Debug|ARM - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Debug|ARM.Build.0 = Debug|ARM - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Debug|ARM.Deploy.0 = Debug|ARM - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Debug|x64.ActiveCfg = Debug|x64 - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Debug|x64.Build.0 = Debug|x64 - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Debug|x64.Deploy.0 = Debug|x64 + {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Debug|ARM.ActiveCfg = Debug|x86 + {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Debug|x64.ActiveCfg = Debug|x86 {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Debug|x86.ActiveCfg = Debug|x86 {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Debug|x86.Build.0 = Debug|x86 {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Debug|x86.Deploy.0 = Debug|x86 - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Release|ARM.ActiveCfg = Release|ARM - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Release|ARM.Build.0 = Release|ARM - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Release|ARM.Deploy.0 = Release|ARM - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Release|x64.ActiveCfg = Release|x64 - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Release|x64.Build.0 = Release|x64 - {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Release|x64.Deploy.0 = Release|x64 + {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Release|ARM.ActiveCfg = Release|x86 + {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Release|x64.ActiveCfg = Release|x86 {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Release|x86.ActiveCfg = Release|x86 {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Release|x86.Build.0 = Release|x86 {E64CDFED-CBE6-42D7-9755-D739EFF1E2BB}.Release|x86.Deploy.0 = Release|x86