Updated to use latest Lumia SensorCore SDK 1.1 Preview

satyambandarapu · satyambandarapu · commit fd9d6b837de3 · 2015-03-03T12:37:22.000+02:00
diff --git a/HelloSensorCore/App.xaml b/HelloSensorCore/App.xaml
@@ -3,5 +3,4 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:HelloSensorCore">
-
 </Application>
diff --git a/HelloSensorCore/App.xaml.cs b/HelloSensorCore/App.xaml.cs
@@ -1,4 +1,5 @@
-﻿/*	
+﻿/*
+The MIT License (MIT)
 Copyright (c) 2015 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -35,7 +36,6 @@ namespace HelloSensorCore
     /// </summary>
     public sealed partial class App : Application
     {
-
         private TransitionCollection transitions;
 
         /// <summary>
@@ -46,7 +46,6 @@ public App()
         {
             this.InitializeComponent();
             this.Suspending += this.OnSuspending;
-
         }
 
         /// <summary>
@@ -63,28 +62,22 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                 this.DebugSettings.EnableFrameRateCounter = true;
             }
 #endif
-
             Frame rootFrame = Window.Current.Content as Frame;
-
             // Do not repeat app initialization when the Window already has content,
             // just ensure that the window is active
             if (rootFrame == null)
             {
                 // Create a Frame to act as the navigation context and navigate to the first page
                 rootFrame = new Frame();
-
                 // TODO: change this value to a cache size that is appropriate for your application
                 rootFrame.CacheSize = 1;
-
                 if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
                 {
                     // TODO: Load state from previously suspended application
                 }
-
                 // Place the frame in the current Window
                 Window.Current.Content = rootFrame;
             }
-
             if (rootFrame.Content == null)
             {
                 // Removes the turnstile navigation for startup.
@@ -96,10 +89,8 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                         this.transitions.Add(c);
                     }
                 }
-
                 rootFrame.ContentTransitions = null;
                 rootFrame.Navigated += this.RootFrame_FirstNavigated;
-
                 // When the navigation stack isn't restored navigate to the first page,
                 // configuring the new page by passing required information as a navigation
                 // parameter
@@ -108,7 +99,6 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                     throw new Exception("Failed to create initial page");
                 }
             }
-
             // Ensure the current window is active
             Window.Current.Activate();
         }
@@ -135,7 +125,6 @@ private void RootFrame_FirstNavigated(object sender, NavigationEventArgs e)
         private void OnSuspending(object sender, SuspendingEventArgs e)
         {
             var deferral = e.SuspendingOperation.GetDeferral();
-
             // TODO: Save application state and stop any background activity
             deferral.Complete();
         }
diff --git a/HelloSensorCore/HelloSensorCore.csproj b/HelloSensorCore/HelloSensorCore.csproj
@@ -114,41 +114,16 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Help\LumiaSensorCoreSDK.chm" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Lumia.Sense, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\LumiaSensorCoreSDK.1.0.3.263\lib\portable-wpa81+wp81\x86\Lumia.Sense.winmd</HintPath>
-    </Reference>
-    <Reference Include="Lumia.Sense.Testing">
-      <HintPath>..\packages\LumiaSensorCoreSDKTesting.1.0.3.263\lib\portable-wpa81+wp81\x86\Lumia.Sense.Testing.winmd</HintPath>
-    </Reference>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
+  <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
     <VisualStudioVersion>12.0</VisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == '' ">
     <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <Import Project="..\packages\LumiaSensorCoreSDK.1.0.3.263\build\wpa81\LumiaSensorCoreSDK.targets" Condition="Exists('..\packages\LumiaSensorCoreSDK.1.0.3.263\build\wpa81\LumiaSensorCoreSDK.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\LumiaSensorCoreSDK.1.0.3.263\build\wpa81\LumiaSensorCoreSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LumiaSensorCoreSDK.1.0.3.263\build\wpa81\LumiaSensorCoreSDK.targets'))" />
-    <Error Condition="!Exists('..\packages\LumiaSensorCoreSDKTesting.1.0.3.263\build\wpa81\LumiaSensorCoreSDKTesting.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LumiaSensorCoreSDKTesting.1.0.3.263\build\wpa81\LumiaSensorCoreSDKTesting.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <Import Project="..\packages\LumiaSensorCoreSDKTesting.1.0.3.263\build\wpa81\LumiaSensorCoreSDKTesting.targets" Condition="Exists('..\packages\LumiaSensorCoreSDKTesting.1.0.3.263\build\wpa81\LumiaSensorCoreSDKTesting.targets')" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/HelloSensorCore/MainPage.xaml b/HelloSensorCore/MainPage.xaml
@@ -9,6 +9,9 @@
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
     <Grid>
-        <ListBox x:Name="SensorcoreList"/>
+        <StackPanel>
+            <ListBox x:Name="SensorcoreList"/>
+            <Button x:Name="LoadButton" Content="Play preinstalled recording" Click="LoadButton_Click"/>
+        </StackPanel>
     </Grid>
 </Page>
diff --git a/HelloSensorCore/MainPage.xaml.cs b/HelloSensorCore/MainPage.xaml.cs
@@ -1,4 +1,5 @@
 ﻿/*	
+The MIT License (MIT)
 Copyright (c) 2015 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -19,15 +20,19 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE. 
  */
-
 using System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 using Windows.UI.Popups;
 using Lumia.Sense;
 using System.Threading.Tasks;
+using Windows.Web;
+using Lumia.Sense.Testing;
 
+/// <summary>
+/// The Basic Page item template is documented at http://go.microsoft.com/fwlink/?LinkID=390556
+/// </summar
 namespace HelloSensorCore
 {
     /// <summary>
@@ -39,7 +44,7 @@ public sealed partial class MainPage : Page
         /// <summary>
         /// Step counter instance
         /// </summary>
-        private StepCounter _stepCounter;
+        private IStepCounter _stepCounter;
         #endregion
 
         public MainPage()
@@ -77,6 +82,52 @@ public MainPage()
             };
         }
 
+         /// <summary>
+        /// Check motion data settings
+        /// </summary>
+        private async void CheckMotionDataSettings()
+        {
+            if (!(await StepCounter.IsSupportedAsync()))
+            {
+                MessageDialog dlg = new MessageDialog("Unfortunately this device does not support step counting");
+                await dlg.ShowAsync();
+                Application.Current.Exit();
+            }
+            else 
+            {
+                // MotionDataSettings settings = await SenseHelper.GetSettingsAsync();
+                // Starting from version 2 of Motion data settings Step counter and Acitivity monitor are always available. In earlier versions system
+                // location setting and Motion data had to be enabled.
+                uint apiSet = await SenseHelper.GetSupportedApiSetAsync();
+                MotionDataSettings settings = await SenseHelper.GetSettingsAsync();
+                if (apiSet > 2)
+                {
+                    if (!settings.LocationEnabled)
+                    {
+                        MessageDialog dlg = new MessageDialog("In order to count steps you need to enable location in system settings. Do you want to open settings now?", "Information");
+                        dlg.Commands.Add(new UICommand("Yes", new UICommandInvokedHandler(async (cmd) => await SenseHelper.LaunchLocationSettingsAsync())));
+                        dlg.Commands.Add(new UICommand("No"));
+                        await dlg.ShowAsync();
+                    }
+                    if (!settings.PlacesVisited)
+                    {
+                        MessageDialog dlg = null;
+                        if (settings.Version < 2)
+                        {
+                            dlg = new MessageDialog("In order to count steps you need to enable Motion data collection in Motion data settings. Do you want to open settings now?", "Information");
+                        }
+                        else
+                        {
+                            dlg = new MessageDialog("In order to collect and view visited places you need to enable Places visited in Motion data settings. Do you want to open settings now? if no, application will exit", "Information");
+                        }
+                        dlg.Commands.Add(new UICommand("Yes", new UICommandInvokedHandler(async (cmd) => await SenseHelper.LaunchSenseSettingsAsync())));
+                        dlg.Commands.Add(new UICommand("No", new UICommandInvokedHandler((cmd) => { Application.Current.Exit(); })));
+                        await dlg.ShowAsync();
+                    }
+                }
+            }
+        }
+
         /// <summary> 
         /// Performs asynchronous SensorCore SDK operation and handles any exceptions 
         /// </summary> 
@@ -93,7 +144,6 @@ private async Task<bool> CallSensorcoreApiAsync( Func<Task> action )
             {
                 failure = e;
             }
-
             if( failure != null )
             {
                 MessageDialog dialog;
@@ -106,21 +156,18 @@ private async Task<bool> CallSensorcoreApiAsync( Func<Task> action )
                         await dialog.ShowAsync();
                         new System.Threading.ManualResetEvent( false ).WaitOne( 500 );
                         return false;
-
                     case SenseError.SenseDisabled:
                         dialog = new MessageDialog( "Motion data has been disabled. Do you want to open Motion data settings now?", "Information" );
                         dialog.Commands.Add( new UICommand( "Yes", async cmd => await SenseHelper.LaunchSenseSettingsAsync() ) );
                         dialog.Commands.Add( new UICommand( "No" ) );
                         await dialog.ShowAsync();
                         new System.Threading.ManualResetEvent( false ).WaitOne( 500 );
                         return false;
-
                     case SenseError.SensorNotAvailable:
                         dialog = new MessageDialog( "The sensor is not supported on this device", "Information" );
                         await dialog.ShowAsync();
                         new System.Threading.ManualResetEvent( false ).WaitOne( 500 );
                         return false;
-
                     default:
                         dialog = new MessageDialog( "Failure: " + SenseHelper.GetSenseError( failure.HResult ), "" );
                         await dialog.ShowAsync();
@@ -157,5 +204,47 @@ await CallSensorcoreApiAsync( async () =>
                 }
             } );
         }
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            base.OnNavigatedTo(e);
+            CheckMotionDataSettings();
+        }
+
+        /// <summary>
+        /// Play preinstalled recording button click handler
+        /// </summary>
+        /// <param name="sender">Sender object</param>
+        /// <param name="args">Event arguments</param>
+        private async void LoadButton_Click(object sender, RoutedEventArgs e)
+        {
+            SenseRecording recording = null;
+            WebErrorStatus exceptionDetail = new WebErrorStatus();
+            try
+            {
+                recording = await SenseRecording.LoadFromUriAsync(new Uri("https://github.com/Microsoft/steps/raw/master/Steps/Simulations/short%20walk.txt"));
+            }
+            catch (Exception ex)
+            {
+                exceptionDetail = WebError.GetStatus(ex.GetBaseException().HResult);
+            }
+            if (exceptionDetail == WebErrorStatus.HostNameNotResolved)
+            {
+                MessageDialog dialog = new MessageDialog("Check your network connection. Host name could not be resolved.", "Information");
+                await dialog.ShowAsync();
+            }
+            if (recording != null)
+            {
+                _stepCounter = await StepCounterSimulator.GetDefaultAsync(recording);
+                MessageDialog dialog = new MessageDialog(
+                "Recorded sensor type: " + recording.Type.ToString() +
+                "\r\nDescription: " + recording.Description +
+                "\r\nRecording date: " + recording.StartTime.ToString() +
+                "\r\nDuration: " + recording.Duration.ToString(),
+                "Recording info"
+                );
+                await dialog.ShowAsync();
+            }
+        }
     }
 }
diff --git a/HelloSensorCore/Package.appxmanifest b/HelloSensorCore/Package.appxmanifest
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
-  <Identity Name="340d9f12-2e04-440f-8b42-9a426c037d17" Publisher="CN=janineva" Version="1.0.0.1" />
+  <Identity Name="340d9f12-2e04-440f-8b42-9a426c037d17" Publisher="CN=janineva" Version="1.1.0.3" />
   <mp:PhoneIdentity PhoneProductId="340d9f12-2e04-440f-8b42-9a426c037d17" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>HelloSensorCore</DisplayName>
@@ -24,6 +24,7 @@
     </Application>
   </Applications>
   <Capabilities>
+    <Capability Name="internetClientServer" />
     <DeviceCapability Name="location" />
     <m2:DeviceCapability Name="humaninterfacedevice">
       <m2:Device Id="vidpid:0421 0716">
diff --git a/HelloSensorCore/packages.config b/HelloSensorCore/packages.config
@@ -1,5 +1,3 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LumiaSensorCoreSDK" version="1.0.3.263" targetFramework="wpa81" />
-  <package id="LumiaSensorCoreSDKTesting" version="1.0.3.263" targetFramework="wpa81" />
 </packages>
diff --git a/README.md b/README.md
@@ -31,7 +31,8 @@ http://msdn.microsoft.com/en-us/library/gg588378%28v=vs.92%29.aspx
 
 2. Version history
 --------------------------------------------------------------------------------
-
+* Version 1.1.0.3:
+  * Updated to use latest Lumia SensorCore SDK 1.1 Preview
 * Version 1.0.0.1: 
  * Some bug fixes made in this release.
 * Version 1.0: The first release.
@@ -41,6 +42,7 @@ http://msdn.microsoft.com/en-us/library/gg588378%28v=vs.92%29.aspx
 
 | Project | Release | Download |
 | ------- | --------| -------- |
+| Steps | v1.1.0.3 | [hello-sensorcore-1.1.0.3.zip](https://github.com/Microsoft/hello-sensorcore/archive/v1.1.0.3.zip) |
 | Steps | v1.0.0.1 | [hello-sensorcore-1.0.0.1.zip](https://github.com/Microsoft/hello-sensorcore/archive/v1.0.0.1.zip) |
 | Steps | v1.0 | [hello-sensorcore-1.0.zip](https://github.com/Microsoft/hello-sensorcore/archive/v1.0.zip) |
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-/*`
	`1`	`+/*`
	`2`	`+The MIT License (MIT)`
`2`	`3`	`Copyright (c) 2015 Microsoft`
`3`	`4`
`4`	`5`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`@@ -35,7 +36,6 @@ namespace HelloSensorCore`
`35`	`36`	`/// </summary>`
`36`	`37`	`public sealed partial class App : Application`
`37`	`38`	`{`
`38`		`-`
`39`	`39`	`private TransitionCollection transitions;`
`40`	`40`
`41`	`41`	`/// <summary>`
`@@ -46,7 +46,6 @@ public App()`
`46`	`46`	`{`
`47`	`47`	`this.InitializeComponent();`
`48`	`48`	`this.Suspending += this.OnSuspending;`
`49`		`-`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`/// <summary>`
`@@ -63,28 +62,22 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)`
`63`	`62`	`this.DebugSettings.EnableFrameRateCounter = true;`
`64`	`63`	`}`
`65`	`64`	`#endif`
`66`		`-`
`67`	`65`	`Frame rootFrame = Window.Current.Content as Frame;`
`68`		`-`
`69`	`66`	`// Do not repeat app initialization when the Window already has content,`
`70`	`67`	`// just ensure that the window is active`
`71`	`68`	`if (rootFrame == null)`
`72`	`69`	`{`
`73`	`70`	`// Create a Frame to act as the navigation context and navigate to the first page`
`74`	`71`	`rootFrame = new Frame();`
`75`		`-`
`76`	`72`	`// TODO: change this value to a cache size that is appropriate for your application`
`77`	`73`	`rootFrame.CacheSize = 1;`
`78`		`-`
`79`	`74`	`if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)`
`80`	`75`	`{`
`81`	`76`	`// TODO: Load state from previously suspended application`
`82`	`77`	`}`
`83`		`-`
`84`	`78`	`// Place the frame in the current Window`
`85`	`79`	`Window.Current.Content = rootFrame;`
`86`	`80`	`}`
`87`		`-`
`88`	`81`	`if (rootFrame.Content == null)`
`89`	`82`	`{`
`90`	`83`	`// Removes the turnstile navigation for startup.`
`@@ -96,10 +89,8 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)`
`96`	`89`	`this.transitions.Add(c);`
`97`	`90`	`}`
`98`	`91`	`}`
`99`		`-`
`100`	`92`	`rootFrame.ContentTransitions = null;`
`101`	`93`	`rootFrame.Navigated += this.RootFrame_FirstNavigated;`
`102`		`-`
`103`	`94`	`// When the navigation stack isn't restored navigate to the first page,`
`104`	`95`	`// configuring the new page by passing required information as a navigation`
`105`	`96`	`// parameter`
`@@ -108,7 +99,6 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)`
`108`	`99`	`throw new Exception("Failed to create initial page");`
`109`	`100`	`}`
`110`	`101`	`}`
`111`		`-`
`112`	`102`	`// Ensure the current window is active`
`113`	`103`	`Window.Current.Activate();`
`114`	`104`	`}`
`@@ -135,7 +125,6 @@ private void RootFrame_FirstNavigated(object sender, NavigationEventArgs e)`
`135`	`125`	`private void OnSuspending(object sender, SuspendingEventArgs e)`
`136`	`126`	`{`
`137`	`127`	`var deferral = e.SuspendingOperation.GetDeferral();`
`138`		`-`
`139`	`128`	`// TODO: Save application state and stop any background activity`
`140`	`129`	`deferral.Complete();`
`141`	`130`	`}`