Windows 10 Creators Update - March 2017 Update 4

microsoft · Mar 30, 2017 · e8ef3d8 · e8ef3d8
2 parents 66db4fc + cebe1f6
commit e8ef3d8
Show file tree

Hide file tree

Showing 97 changed files with 2,460 additions and 812 deletions.
diff --git a/Samples/BarcodeScanner/cpp/BarcodeScanner.vcxproj b/Samples/BarcodeScanner/cpp/BarcodeScanner.vcxproj
@@ -145,6 +145,7 @@
     <ClInclude Include="..\..\..\SharedContent\cpp\MainPage.xaml.h">
       <DependentUpon>..\..\..\SharedContent\cpp\MainPage.xaml</DependentUpon>
     </ClInclude>
+    <ClInclude Include="..\..\..\SharedContent\cpp\DeviceHelpers.h" />
     <ClInclude Include="SampleConfiguration.h" />
     <ClInclude Include="Scenario1_BasicFunctionality.xaml.h">
       <DependentUpon>..\shared\Scenario1_BasicFunctionality.xaml</DependentUpon>

diff --git a/Samples/BarcodeScanner/cpp/BarcodeScanner.vcxproj.filters b/Samples/BarcodeScanner/cpp/BarcodeScanner.vcxproj.filters
@@ -24,6 +24,7 @@
     <ClInclude Include="pch.h" />
     <ClInclude Include="..\..\..\SharedContent\cpp\App.xaml.h" />
     <ClInclude Include="..\..\..\SharedContent\cpp\MainPage.xaml.h" />
+    <ClInclude Include="..\..\..\SharedContent\cpp\DeviceHelpers.h" />
     <ClInclude Include="SampleConfiguration.h" />
     <ClInclude Include="Scenario1_BasicFunctionality.xaml.h" />
     <ClInclude Include="Scenario2_MultipleScanners.xaml.h" />

diff --git a/Samples/BarcodeScanner/cpp/SampleConfiguration.cpp b/Samples/BarcodeScanner/cpp/SampleConfiguration.cpp
@@ -13,10 +13,21 @@
 #include "MainPage.xaml.h"
 #include "SampleConfiguration.h"
 
+using namespace Concurrency;
+using namespace Platform;
 using namespace SDKTemplate;
+using namespace Windows::Devices::Enumeration;
+using namespace Windows::Devices::PointOfService;
+using namespace Windows::Foundation;
 
 Platform::Array<Scenario>^ MainPage::scenariosInner = ref new Platform::Array<Scenario>
 {
     { "DataReceived Event", "SDKTemplate.Scenario1_BasicFunctionality" },
     { "Release/Retain Functionality", "SDKTemplate.Scenario2_MultipleScanners" },
 };
+
+task<BarcodeScanner^> DeviceHelpers::GetFirstBarcodeScannerAsync()
+{
+    return DeviceHelpers::GetFirstDeviceAsync(BarcodeScanner::GetDeviceSelector(),
+        [](String^ id) { return create_task(BarcodeScanner::FromIdAsync(id)); });
+}
diff --git a/Samples/BarcodeScanner/cpp/SampleConfiguration.h b/Samples/BarcodeScanner/cpp/SampleConfiguration.h
@@ -12,6 +12,7 @@
 #pragma once
 
 #include "pch.h"
+#include "DeviceHelpers.h"
 
 namespace SDKTemplate
 {
@@ -45,4 +46,9 @@ namespace SDKTemplate
         Platform::String^ Title;
         Platform::String^ ClassName;
     };
+
+    namespace DeviceHelpers
+    {
+        Concurrency::task<Windows::Devices::PointOfService::BarcodeScanner^> GetFirstBarcodeScannerAsync();
+    }
 }
diff --git a/Samples/BarcodeScanner/cpp/Scenario1_BasicFunctionality.xaml.cpp b/Samples/BarcodeScanner/cpp/Scenario1_BasicFunctionality.xaml.cpp
@@ -30,75 +30,37 @@ Scenario1_BasicFunctionality::Scenario1_BasicFunctionality() : rootPage(MainPage
     InitializeComponent();
 }
 
-/// <summary>
-/// Creates the default barcode scanner.
-/// </summary>
-task<void> Scenario1_BasicFunctionality::CreateDefaultScannerObject()
-{
-    return create_task(DeviceInformation::FindAllAsync(BarcodeScanner::GetDeviceSelector())).then([this](DeviceInformationCollection^ deviceCollection)
-    {
-        if (deviceCollection == nullptr || deviceCollection->Size == 0)
-        {
-            rootPage->NotifyUser("Barcode scanner not found. Please connect a barcode scanner.", NotifyType::ErrorMessage);
-            return task_from_result();
-        }
-
-        DeviceInformation^ scannerInfo = deviceCollection->GetAt(0);
-        return create_task(BarcodeScanner::FromIdAsync(scannerInfo->Id)).then([this](BarcodeScanner^ _scanner)
-        {
-            this->scanner = _scanner;
-            if (this->scanner == nullptr)
-            {
-                rootPage->NotifyUser("Failed to create barcode scanner object.", NotifyType::ErrorMessage);
-            }
-        });
-    });
-}
-
-/// <summary>
-/// This method claims the barcode scanner
-/// </summary>
-task<void> Scenario1_BasicFunctionality::ClaimScanner()
-{
-    // claim the barcode scanner
-    return create_task(scanner->ClaimScannerAsync()).then([this](ClaimedBarcodeScanner^ _claimedScanner)
-    {
-        this->claimedScanner = _claimedScanner;
-        // enable the claimed barcode scanner
-        if (claimedScanner == nullptr)
-        {
-            rootPage->NotifyUser("Claim barcode scanner failed.", NotifyType::ErrorMessage);
-        }
-    });
-}
-
 // <summary>
 /// Setup the barcode scanner to be ready to receive the data events from the scan.
 /// </summary>
 /// <param name="sender"></param>
 /// <param name="e"></param>
 void Scenario1_BasicFunctionality::ScenarioStartScanButton_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
 {
-    rootPage->NotifyUser("Creating barcode scanner object.", NotifyType::StatusMessage);
+    ScenarioStartScanButton->IsEnabled = false;
+
+    rootPage->NotifyUser("Acquiring barcode scanner object.", NotifyType::StatusMessage);
 
-    // create the barcode scanner. 
-    create_task(CreateDefaultScannerObject()).then([this](void)
+    // Acquire the barcode scanner.
+    DeviceHelpers::GetFirstBarcodeScannerAsync().then([this](BarcodeScanner^ foundScanner)
     {
+        scanner = foundScanner;
         if (scanner != nullptr)
         {
-            // after successful creation, claim the scanner for exclusive use and enable it so that data reveived events are received.
-            create_task(ClaimScanner()).then([this](void)
+            // After acquiring, claim the scanner for exclusive use and enable it so that data received events are received.
+            create_task(scanner->ClaimScannerAsync()).then([this](ClaimedBarcodeScanner^ _claimedScanner)
             {
+                claimedScanner = _claimedScanner;
                 if (claimedScanner)
                 {
                     // It is always a good idea to have a release device requested event handler. If this event is not handled, there are chances of another app can 
                     // claim ownsership of the barcode scanner.
-                    releaseDeviceRequestedToken = claimedScanner->ReleaseDeviceRequested::add(ref new EventHandler<ClaimedBarcodeScanner^>(this, &Scenario1_BasicFunctionality::OnReleaseDeviceRequested));
+                    releaseDeviceRequestedToken = claimedScanner->ReleaseDeviceRequested += ref new EventHandler<ClaimedBarcodeScanner^>(this, &Scenario1_BasicFunctionality::OnReleaseDeviceRequested);
 
-                    // after successfully claiming, attach the datareceived event handler.
-                    dataReceivedToken = claimedScanner->DataReceived::add(ref new TypedEventHandler<ClaimedBarcodeScanner^, BarcodeScannerDataReceivedEventArgs^>(this, &Scenario1_BasicFunctionality::OnDataReceived));
+                    // After successfully claiming, attach the datareceived event handler.
+                    dataReceivedToken = claimedScanner->DataReceived += ref new TypedEventHandler<ClaimedBarcodeScanner^, BarcodeScannerDataReceivedEventArgs^>(this, &Scenario1_BasicFunctionality::OnDataReceived);
 
-                    // Ask the API to decode the data by default. By setting this, API will decode the raw data from the barcode scanner and 
+                    // Ask for the raw data from the barcode scanner to be decoded and
                     // send the ScanDataLabel and ScanDataType in the DataReceived event
                     claimedScanner->IsDecodeDataEnabled = true;
 
@@ -108,15 +70,22 @@ void Scenario1_BasicFunctionality::ScenarioStartScanButton_Click(Platform::Objec
                     create_task(claimedScanner->EnableAsync()).then([this](void)
                     {
                         rootPage->NotifyUser("Ready to scan. Device ID: " + claimedScanner->DeviceId, NotifyType::StatusMessage);
-
-                        // reset the button state
                         ScenarioEndScanButton->IsEnabled = true;
-                        ScenarioStartScanButton->IsEnabled = false;
-                    });
+                    }, task_continuation_context::use_current());
+                }
+                else
+                {
+                    rootPage->NotifyUser("Claim barcode scanner failed.", NotifyType::ErrorMessage);
+                    ScenarioStartScanButton->IsEnabled = true;
                 }
             });
         }
-    });
+        else
+        {
+            rootPage->NotifyUser("Barcode scanner not found. Please connect a barcode scanner.", NotifyType::ErrorMessage);
+            ScenarioStartScanButton->IsEnabled = true;
+        }
+    }, task_continuation_context::use_current());
 
 }
 
@@ -197,8 +166,8 @@ void Scenario1_BasicFunctionality::ResetTheScenarioState()
     if (claimedScanner != nullptr)
     {
         // Detach the event handlers
-        claimedScanner->DataReceived::remove(dataReceivedToken);
-        claimedScanner->ReleaseDeviceRequested::remove(releaseDeviceRequestedToken);
+        claimedScanner->DataReceived -= dataReceivedToken;
+        claimedScanner->ReleaseDeviceRequested -= releaseDeviceRequestedToken;
 
         // release the Barcode Scanner and set to null
         delete claimedScanner;

diff --git a/Samples/BarcodeScanner/cpp/Scenario1_BasicFunctionality.xaml.h b/Samples/BarcodeScanner/cpp/Scenario1_BasicFunctionality.xaml.h
@@ -38,9 +38,6 @@ namespace SDKTemplate
         void ScenarioStartScanButton_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
         void ScenarioEndScanButton_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
 
-        Concurrency::task<void> CreateDefaultScannerObject();
-        Concurrency::task<void> ClaimScanner();
-        void UpdateOutput(Platform::String^ strMessage);
         void ResetTheScenarioState();
 
         void OnDataReceived(Windows::Devices::PointOfService::ClaimedBarcodeScanner ^sender, Windows::Devices::PointOfService::BarcodeScannerDataReceivedEventArgs ^args);

diff --git a/Samples/BarcodeScanner/cs/BarcodeScanner.csproj b/Samples/BarcodeScanner/cs/BarcodeScanner.csproj
@@ -96,6 +96,9 @@
     <Compile Include="..\..\..\SharedContent\cs\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\SharedContent\cs\DeviceHelpers.cs">
+      <Link>DeviceHelpers.cs</Link>
+    </Compile>
     <Compile Include="SampleConfiguration.cs" />
     <Compile Include="Scenario1_BasicFunctionality.xaml.cs">
       <DependentUpon>Scenario1_BasicFunctionality.xaml</DependentUpon>

diff --git a/Samples/BarcodeScanner/cs/SampleConfiguration.cs b/Samples/BarcodeScanner/cs/SampleConfiguration.cs
@@ -11,6 +11,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
+using Windows.Devices.Enumeration;
+using Windows.Devices.PointOfService;
 using Windows.UI.Xaml.Controls;
 
 namespace SDKTemplate
@@ -31,4 +34,12 @@ public class Scenario
         public string Title { get; set; }
         public Type ClassType { get; set; }
     }
+
+    public partial class DeviceHelpers
+    {
+        public static async Task<BarcodeScanner> GetFirstBarcodeScannerAsync()
+        {
+            return await DeviceHelpers.GetFirstDeviceAsync(BarcodeScanner.GetDeviceSelector(), async (id) => await BarcodeScanner.FromIdAsync(id));
+        }
+    }
 }
diff --git a/Samples/BarcodeScanner/cs/Scenario1_BasicFunctionality.xaml.cs b/Samples/BarcodeScanner/cs/Scenario1_BasicFunctionality.xaml.cs
@@ -40,57 +40,6 @@ public Scenario1_BasicFunctionality()
             this.InitializeComponent();
         }
 
-        /// <summary>
-        /// Creates the default barcode scanner.
-        /// </summary>
-        /// <returns>true if barcode scanner is created. Otherwise returns false</returns>
-        private async Task<bool> CreateDefaultScannerObject()
-        {
-            if (scanner == null)
-            {
-                rootPage.NotifyUser("Creating barcode scanner object.", NotifyType.StatusMessage);
-                DeviceInformationCollection deviceCollection = await DeviceInformation.FindAllAsync(BarcodeScanner.GetDeviceSelector());
-                if (deviceCollection != null && deviceCollection.Count > 0)
-                {
-                    scanner = await BarcodeScanner.FromIdAsync(deviceCollection[0].Id);
-
-                    if (scanner == null)
-                    {
-                        rootPage.NotifyUser("Failed to create barcode scanner object.", NotifyType.ErrorMessage);
-                        return false;
-                    }
-                }
-                else
-                {
-                    rootPage.NotifyUser("Barcode scanner not found. Please connect a barcode scanner.", NotifyType.ErrorMessage);
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// This method claims the barcode scanner 
-        /// </summary>
-        /// <returns>true if claim is successful. Otherwise returns false</returns>
-        private async Task<bool> ClaimScanner()
-        {
-            if (claimedScanner == null)
-            {
-                // claim the barcode scanner
-                claimedScanner = await scanner.ClaimScannerAsync();
-
-                // enable the claimed barcode scanner
-                if (claimedScanner == null)
-                {
-                    rootPage.NotifyUser("Claim barcode scanner failed.", NotifyType.ErrorMessage);
-                    return false;
-                }
-            }
-            return true;
-        }
-
         /// <summary>
         /// Invoked when this page is about to be displayed in a Frame.
         /// </summary>
@@ -121,15 +70,19 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)
         /// <param name="e"></param>
         private async void ScenarioStartScanButton_Click(object sender, RoutedEventArgs e)
         {
-            rootPage.NotifyUser("Creating barcode scanner object.", NotifyType.StatusMessage);
+            ScenarioStartScanButton.IsEnabled = false;
 
-            // create the barcode scanner. 
-            if (await CreateDefaultScannerObject())
+            rootPage.NotifyUser("Acquiring barcode scanner object.", NotifyType.StatusMessage);
+
+            // Acquire the barcode scanner.
+            scanner = await DeviceHelpers.GetFirstBarcodeScannerAsync();
+            if (scanner != null)
             {
                 // after successful creation, claim the scanner for exclusive use and enable it so that data reveived events are received.
-                if (await ClaimScanner())
-                {
+                claimedScanner = await scanner.ClaimScannerAsync();
 
+                if (claimedScanner != null)
+                {
                     // It is always a good idea to have a release device requested event handler. If this event is not handled, there are chances of another app can 
                     // claim ownsership of the barcode scanner.
                     claimedScanner.ReleaseDeviceRequested += claimedScanner_ReleaseDeviceRequested;
@@ -146,13 +99,20 @@ private async void ScenarioStartScanButton_Click(object sender, RoutedEventArgs
                     // if the claimedScanner has not beed Enabled
                     await claimedScanner.EnableAsync();
 
-                    // reset the button state
-                    ScenarioEndScanButton.IsEnabled = true;
-                    ScenarioStartScanButton.IsEnabled = false;
-
                     rootPage.NotifyUser("Ready to scan. Device ID: " + claimedScanner.DeviceId, NotifyType.StatusMessage);
+                    ScenarioEndScanButton.IsEnabled = true;
+                }
+                else
+                {
+                    rootPage.NotifyUser("Claim barcode scanner failed.", NotifyType.ErrorMessage);
+                    ScenarioStartScanButton.IsEnabled = true;
                 }
             }
+            else
+            {
+                rootPage.NotifyUser("Barcode scanner not found. Please connect a barcode scanner.", NotifyType.ErrorMessage);
+                ScenarioStartScanButton.IsEnabled = true;
+            }
         }
 
         /// <summary>

diff --git a/Samples/BarcodeScanner/js/BarcodeScanner.jsproj b/Samples/BarcodeScanner/js/BarcodeScanner.jsproj
@@ -82,6 +82,9 @@
     <Content Include="..\..\..\SharedContent\js\js\default.js">
       <Link>js\default.js</Link>
     </Content>
+    <Content Include="..\..\..\SharedContent\js\js\devicehelpers.js">
+      <Link>js\devicehelpers.js</Link>
+    </Content>
     <Content Include="..\..\..\SharedContent\js\css\default.css">
       <Link>css\default.css</Link>
     </Content>

diff --git a/Samples/BarcodeScanner/js/html/scenario1_BasicFunctionality.html b/Samples/BarcodeScanner/js/html/scenario1_BasicFunctionality.html
@@ -17,6 +17,7 @@
 <head>
     <title></title>
     <link rel="stylesheet" href="/css/scenario1_BasicFunctionality.css">
+    <script src="/js/devicehelpers.js"></script>
     <script src="/js/scenario1_BasicFunctionality.js"></script>
     <script src="/js/util.js"></script>
 </head>

diff --git a/Samples/BarcodeScanner/js/js/sample-configuration.js b/Samples/BarcodeScanner/js/js/sample-configuration.js
@@ -19,8 +19,15 @@
         { url: "/html/scenario2_MultipleScanners.html", title: "Release/Retain functionality" }
     ];
 
+    var BarcodeScanner = Windows.Devices.PointOfService.BarcodeScanner;
+
+    function getFirstBarcodeScannerAsync() {
+        return DeviceHelpers.getFirstDeviceAsync(BarcodeScanner.getDeviceSelector(), (id) => BarcodeScanner.fromIdAsync(id));
+}
+
     WinJS.Namespace.define("SdkSample", {
         sampleTitle: sampleTitle,
-        scenarios: new WinJS.Binding.List(scenarios)
+        scenarios: new WinJS.Binding.List(scenarios),
+        getFirstBarcodeScannerAsync: getFirstBarcodeScannerAsync
     });
 })();