updated SDK 3.21 and energy example

Anyline · Feb 14, 2018 · 56df82c · 56df82c
1 parent 9fd557a
commit 56df82c
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 78 deletions.
diff --git a/Anyline Windows UWP Examples/Anyline Windows UWP Examples.csproj b/Anyline Windows UWP Examples/Anyline Windows UWP Examples.csproj
@@ -41,52 +41,6 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
     <Content Include="Assets\FlashIcons\torch_auto.png" />
@@ -190,7 +144,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Anyline.winmd</HintPath>
     </Reference>
-    <Reference Include="AnylineSDK, Version=3.20.0.0, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="AnylineSDK, Version=3.21.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\AnylineSDK.dll</HintPath>
     </Reference>

diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/Anyline.winmd b/Anyline.winmd
diff --git a/AnylineSDK.dll b/AnylineSDK.dll
diff --git 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