diff --git a/.gitignore b/.gitignore index c01e1fd7..4e93df9c 100644 --- a/.gitignore +++ b/.gitignore @@ -275,3 +275,34 @@ CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/uz-Latn-UZ/Microsoft.Phone. CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/vi-VN/Microsoft.Phone.Controls.Toolkit.resources.dll CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/zh-CN/Microsoft.Phone.Controls.Toolkit.resources.dll CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/zh-TW/Microsoft.Phone.Controls.Toolkit.resources.dll +CampusAppWP8/Packages.dgml +CampusAppWP8/packages/ZXing.Net.0.11.0.1/ZXing.Net.0.11.0.1.nupkg +CampusAppWP8/packages/ZXing.Net.0.11.0.1/ZXing.Net.0.11.0.1.nuspec +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/net20/zxing.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/net20/zxing.dll +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/net35/zxing.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/net35/zxing.dll +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/net40/zxing.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/net40/zxing.dll +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/net40/zxing.presentation.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/net40/zxing.presentation.dll +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/netcore45/ZXing.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/netcore45/ZXing.pri +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/netcore45/ZXing.winmd +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/portable-win+net40+sl4+sl5+wp7+wp71+wp8/zxing.portable.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/portable-win+net40+sl4+sl5+wp7+wp71+wp8/zxing.portable.dll +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/sl3-wp/zxing.wp7.0.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/sl3-wp/zxing.wp7.0.dll +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/sl4-wp71/zxing.wp7.1.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/sl4-wp71/zxing.wp7.1.dll +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/sl4/zxing.sl4.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/sl4/zxing.sl4.dll +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/sl5/zxing.sl5.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/sl5/zxing.sl5.dll +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/windows8-managed/zxing.winrt.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/windows8-managed/zxing.winrt.dll +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/windows8-native+javascript/ZXing.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/windows8-native+javascript/ZXing.pri +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/windows8-native+javascript/ZXing.winmd +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/wp8/zxing.wp8.0.XML +CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/wp8/zxing.wp8.0.dll diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index f705103d..c40749c8 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -116,9 +116,15 @@ + + + + + NFC.xaml + AppSettingPage.xaml @@ -282,6 +288,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -435,7 +445,9 @@ - + + Designer + diff --git a/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceModel.cs b/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceModel.cs index 876a7701..0a2ed4c2 100644 --- a/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceModel.cs @@ -83,5 +83,14 @@ namespace CampusAppWP8.Model.GeoDb /// The services. [XmlElement("placeService")] public ObservableCollection Services { get; set; } + + /// Converts this object to a nfc string. + /// Stubbfel, 21.08.2013. + /// This object as a string. + public string ToNfcString() + { + string nfcStr = "{\"pid\":\"" + this.PlaceId + "\",\"parent\":\"" + this.ParentId + "\"}"; + return nfcStr; + } } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Dev/NFC.xaml b/CampusAppWP8/CampusAppWP8/Pages/Dev/NFC.xaml new file mode 100644 index 00000000..9f7e46cd --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/Dev/NFC.xaml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + +