diff --git a/CampusAppWP8/CampusAppWP8/App.xaml.cs b/CampusAppWP8/CampusAppWP8/App.xaml.cs
index 38650185..23949af1 100644
--- a/CampusAppWP8/CampusAppWP8/App.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/App.xaml.cs
@@ -243,6 +243,9 @@ namespace CampusAppWP8
// Behandeln Sie Rücksetzanforderungen zum Löschen des Backstack
RootFrame.Navigated += CheckForResetNavigation;
+ // Assign the lens example URI-mapper class to the application frame.
+ RootFrame.UriMapper = new AppUriMapper();
+
// Sicherstellen, dass keine erneute Initialisierung erfolgt
phoneApplicationInitialized = true;
}
diff --git a/CampusAppWP8/CampusAppWP8/Assets/ApplicationIcon.png b/CampusAppWP8/CampusAppWP8/Assets/ApplicationIcon.png
index 7d95d4e0..4bff7b4f 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/ApplicationIcon.png and b/CampusAppWP8/CampusAppWP8/Assets/ApplicationIcon.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Lens.Screen-720p.png b/CampusAppWP8/CampusAppWP8/Assets/Lens.Screen-720p.png
new file mode 100644
index 00000000..243e36b7
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Lens.Screen-720p.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Lens.Screen-WVGA.png b/CampusAppWP8/CampusAppWP8/Assets/Lens.Screen-WVGA.png
new file mode 100644
index 00000000..f1c35fca
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Lens.Screen-WVGA.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Lens.Screen-WXGA.png b/CampusAppWP8/CampusAppWP8/Assets/Lens.Screen-WXGA.png
new file mode 100644
index 00000000..3a37c80d
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Lens.Screen-WXGA.png differ
diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index 01a9682c..635ca627 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -156,6 +156,7 @@
True
Constants.resx
+
@@ -496,6 +497,9 @@
+
+
+
PreserveNewest
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
index e1c72f7c..f0170ebe 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
@@ -27,6 +27,7 @@ namespace CampusAppWP8.Pages.Campusmap
using Windows.Networking.Proximity;
using CampusAppWP8.File.Places;
using System.Windows.Controls;
+ using System.ComponentModel;
/// Class for the campusMap page.
/// Stubbfel, 19.08.2013.
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
index 76f8bd73..fe532e6d 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
@@ -22,6 +22,7 @@ namespace CampusAppWP8.Pages.Dev
using Microsoft.Devices;
using Microsoft.Phone.Controls;
using ZXing;
+ using CampusAppWP8.Utility;
///
/// QR Code scanner.
@@ -85,7 +86,6 @@ namespace CampusAppWP8.Pages.Dev
this.bit = new WriteableBitmap((int)this.cam.PreviewResolution.Width, (int)this.cam.PreviewResolution.Height);
this.camViewBrush.SetSource(this.cam);
- this.isInAutofocus = false;
}
else
{
@@ -219,8 +219,20 @@ namespace CampusAppWP8.Pages.Dev
{
if (this.ResultAppStoreKey != null)
{
- App.SaveToIsolatedStorage(this.ResultAppStoreKey, result.Text);
- NavigationService.GoBack();
+
+ if (NavigationService.CanGoBack)
+ {
+ App.SaveToIsolatedStorage(this.ResultAppStoreKey, result.Text);
+ NavigationService.GoBack();
+ }
+ else
+ {
+ string pid = Wp8StringManager.FilterPlaceIdinQRResultString(result.Text);
+ string urlString = Constants.PathCampusmap_Campusmap;
+ urlString += "?" + Constants.ParamModelMap_SearchTermAlias + "=" + pid;
+ Uri url = new Uri(urlString as string, UriKind.Relative);
+ NavigationService.Navigate(url);
+ }
}
else
{
diff --git a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
index 4d8b94b2..052f573c 100644
--- a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
+++ b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
@@ -2,7 +2,7 @@
- Assets\Tiles\kachel_small.png
+ Assets\ApplicationIcon.png
@@ -22,27 +22,30 @@
-
+
Assets\Tiles\kachel_small.png
0
- Assets\Tiles\kachel_medium.png
- CampusAppWP8
-
-
-
-
-
-
- Assets\Tiles\kachel_large.png
-
-
-
-
-
+ Assets\Tiles\kachel_medium.png
+ BTU-CampusAp
+
+
+
+
True
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
index ba719030..5a20763f 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -537,4 +537,7 @@
Barrierefreiheit
+
+ /Pages/StartPage.xaml
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
index 735d063e..c06afea9 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
@@ -699,6 +699,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die /Pages/StartPage.xaml ähnelt.
+ ///
+ public static string PathApp_StartPage {
+ get {
+ return ResourceManager.GetString("PathApp_StartPage", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die /Pages/Campusmap/CampusMapPage.xaml ähnelt.
///
diff --git a/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs b/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs
new file mode 100644
index 00000000..0e4d8707
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs
@@ -0,0 +1,33 @@
+using CampusAppWP8.Resources;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Navigation;
+
+namespace CampusAppWP8.Utility
+{
+ public class AppUriMapper : UriMapperBase
+ {
+ private string tempUri;
+
+ public override Uri MapUri(Uri uri)
+ {
+ tempUri = uri.ToString();
+
+ // Look for a URI from the lens picker.
+ if (tempUri.Contains("ViewfinderLaunch"))
+ {
+ // Launch as a lens, launch viewfinder screen.
+ tempUri = Constants.PathQR_QRPage;
+ tempUri += "?" + Constants.ParamQRResultKey + "=" + Constants.CampusMapApp_QRCodeSearchResultStorageKey;
+ Uri url = new Uri(tempUri as string, UriKind.Relative);
+ return new Uri(tempUri, UriKind.Relative);
+ }
+
+ // Otherwise perform normal launch.
+ return uri;
+ }
+ }
+}