diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs index 46ee4028..61769824 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapPinModel.cs @@ -9,6 +9,7 @@ namespace CampusAppWP8.Model.Campusmap { using System.Windows; using System.Windows.Input; + using CampusAppWP8.Resources; /// /// This Class manage the properties of a MapPin @@ -196,16 +197,16 @@ namespace CampusAppWP8.Model.Campusmap switch (type) { case PinType.CurrentPosition: - result = MapPinModel.currendPositionPlacePinString; + result = Constants.PinType_CurrentPosition; break; case PinType.Hidden: - result = MapPinModel.hiddenPlacePinString; + result = Constants.PinType_Hidden; break; case PinType.InfoPlace: - result = MapPinModel.infoPlacePinString; + result = Constants.PinType_Info; break; case PinType.SearchPlace: - result = MapPinModel.searchPlacePinString; + result = Constants.PinType_Search; break; default: result = string.Empty; diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs index bc33f12e..55392209 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs @@ -372,7 +372,7 @@ namespace CampusAppWP8.Pages.Campusmap foreach (UIElement child in childs) { Image childImg = child as Image; - if (childImg == null) + if (childImg == null || childImg.Tag == null) { continue; } @@ -448,7 +448,7 @@ namespace CampusAppWP8.Pages.Campusmap { MessageBoxes.ShowMainModelInfoMessageBox(AppResources.ScarNfc_Search); this.ProgressBar.Visibility = Visibility.Visible; - this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); + long id = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); } /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index 5a20763f..da484cb4 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -540,4 +540,16 @@ /Pages/StartPage.xaml + + CurrentPositionPin + + + HiddenPin + + + InfoPin + + + SearchPin + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index c06afea9..2ed1f9a6 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -951,6 +951,42 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die CurrentPositionPin ähnelt. + /// + public static string PinType_CurrentPosition { + get { + return ResourceManager.GetString("PinType_CurrentPosition", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die HiddenPin ähnelt. + /// + public static string PinType_Hidden { + get { + return ResourceManager.GetString("PinType_Hidden", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die InfoPin ähnelt. + /// + public static string PinType_Info { + get { + return ResourceManager.GetString("PinType_Info", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die SearchPin ähnelt. + /// + public static string PinType_Search { + get { + return ResourceManager.GetString("PinType_Search", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die iname ähnelt. /// diff --git a/Doc/html/annotated.html b/Doc/html/annotated.html index 3aef254a..d916ef2e 100644 --- a/Doc/html/annotated.html +++ b/Doc/html/annotated.html @@ -153,12 +153,15 @@ $(document).ready(function(){initNavTree('annotated.html','');});  | \CPlacesFilePlaces file.  oNModel  |oNCampusmap - ||oCCBMainMapModelClass for the MapModel of the mainCampus of cottbus - ||oCCurrentPositionPinModelCurrent position pin model. - ||oCHiddenPinPlaceModelHidden pin place model. - ||oCMapModelThis Class manage the properties of a Map - ||oCMapPinModelThis Class manage the properties of a MapPin - ||\CSearchPlacePinModelSearch pin place model. + ||oCCampusMapModelClass for the CampusMapModel + ||oCCBMainMapModelClass for the MapModel of the mainCampus of cottbus + ||oCClickAblePlacePinModelabstract class for click abel bins + ||oCCurrentPositionPinModelCurrent position pin model. + ||oCHiddenPinPlaceModelHidden pin place model. + ||oCInfoPlacePinModelSearch pin place model. + ||oCMapModelThis Class manage the properties of a Map + ||oCMapPinModelThis Class manage the properties of a MapPin + ||\CSearchPlacePinModelSearch pin place model.  |oNDepartments  ||oCChairModelClass to hold information about a professorship chair.  ||oCDepartmentModelView model for department page. @@ -170,10 +173,12 @@ $(document).ready(function(){initNavTree('annotated.html','');});  ||oCExamListModelExam list model.  ||\CExamModelExam model.  |oNGeoDb - ||oCPlaceInformationInformation about the place. - ||oCPlaceModelModel for a place of the SPSService - ||oCPlaceServicePlace service. - ||\CSpsModelModel for a xml-response of the SPSService + ||oCCampusBuildingLayerModelClass is model for buildings of a campus + ||oCCampusBuildingModelClass is model for buildings of a campus + ||oCPlaceInformationInformation about the place. + ||oCPlaceModelModel for a place of the SPSService + ||oCPlaceServicePlace service. + ||\CSpsModelModel for a xml-response of the SPSService  |oNLecture  ||oCLectureActivityModel for a Activity  ||oCLectureCourseModel for a course @@ -185,43 +190,34 @@ $(document).ready(function(){initNavTree('annotated.html','');});  |oNLink  ||oCLinkListModelModel for a list of links.  ||\CLinkModelModel for menu - |oNMensa - ||oCMealModelModel for a meal - ||oCMenuModelModel for menu - ||\CMenuWeekModelModel for menus in one week - |oNOpeninghours - ||oCOpeninghoursInstitutionModelModel for menu - ||\COpeninghoursModelModel for opening hours. - |oNPerson - ||oCPersonFunctionModelPerson function model. - ||oCPersonListModelPerson list model. - ||\CPersonModelPerson model. - |oNRSS - ||oCRSSChannelModelChannel Model, which contains the RSS feed item list. - ||oCRSSModelContains the RSS feed information. - ||\CRSSViewModelViewModel of the RSS feed, containing the feed/channel object. - |oNSetting - ||oCAppSettingsModel for settings of the app - ||\CUserProfilModelModel for the profile of an user - |oNStudentCouncil - ||oCStudentCouncilListModelModel for menus in one week - ||\CStudentCouncilModelModel for menu - |oNUtility - ||oCCampusListPickerItemListModelThis Class creates a list of degrees - ||oCCleanUrlParamModelThis class is a Model for the URLParameter like GET-Parameter - ||oCCourseListPickerItemListModelThis is a class for the courseList - ||oCCourseModelCourse model. - ||oCDegreeListPickerItemListModelThis Class creates a list of degrees - ||oCListPickerItemListModelClass for a List of ListPickerItems - ||oCListPickerItemModelModel for the ListPickerItems - ||oCRoleListPickerItemListModelClass for the RoleList - ||oCSemesterListPickerItemListModelClass for the SemesterList - ||\CUrlParamModelThis class is a Model for the URLParameter like GET-Parameter - |oCBinaryModelBinary model. - |\CXmlModel< T >Xml model io handler class. + |oNOpeninghours + ||oCOpeninghoursInstitutionModelModel for menu + ||\COpeninghoursModelModel for opening hours. + |oNPerson + ||oCPersonFunctionModelPerson function model. + ||oCPersonListModelPerson list model. + ||\CPersonModelPerson model. + |oNSetting + ||oCAppSettingsModel for settings of the app + ||\CUserProfilModelModel for the profile of an user + |oNStudentCouncil + ||oCStudentCouncilListModelModel for menus in one week + ||\CStudentCouncilModelModel for menu + |oNUtility + ||oCCampusListPickerItemListModelThis Class creates a list of degrees + ||oCCourseListPickerItemListModelThis is a class for the courseList + ||oCCourseModelCourse model. + ||oCDegreeListPickerItemListModelThis Class creates a list of degrees + ||oCListPickerItemListModelClass for a List of ListPickerItems + ||oCListPickerItemModelModel for the ListPickerItems + ||oCRoleListPickerItemListModelClass for the RoleList + ||\CSemesterListPickerItemListModelClass for the SemesterList + |oCBinaryModelBinary model. + |\CXmlModel< T >Xml model io handler class.  oNPages  |oNCampusmap - ||\CCampusMapPageClass for the campusMap page. + ||oCCampusMapPageClass for the campusMap page. + ||\CRoomListPageClass of the RoomListPage  |oNDepartments  ||oCDepartmentFavoritePagePage to visualize the favorite department list.  ||oCDepartmentIndexPagePage with a list of the faculties. @@ -277,21 +273,24 @@ $(document).ready(function(){initNavTree('annotated.html','');});  |||oCPhoneButtonThis class create an Button which start a PhoneCall  |||oCToggleButtonThis class create an Button which can toggle the Visibility of certain FrameworkElements  |||\CUpdateButtonAppBarThis class create an Button which start the Email-Client - ||\NMessageBoxes - || \CMessageBoxesClass creates some MessageBoxes + ||oNMessageBoxes + |||\CMessageBoxesClass creates some MessageBoxes + ||\NTiles + || \CTileCreatorClass creates different live tiles  |oNNDEF  ||oCNDEFMessageNdef message.  ||oCNDEFRecordNdef record of a NDEFMessage.  ||\CNDEFShortRecordNdef short record. - |oCFileFile class. - |oCHttpRequestClass realize the access of restful HttpRequest - |oCLoggerThis Class creates logs for the app - |\CXmlManagerClass provides some Xml-methods - oCApp - oCConstAccess to Constants.rex - oCLocalizedStringsLocalized strings. - oCMainModel< T >Base model io handling class. - \CThemelizedIconsTheme icons. + |oCAppUriMapperClass map Uri to AppPages + |oCBackgroundTasksClass provide some static methods for background tasks + |oCFileFile class. + |oCHttpRequestClass realize the access of restful HttpRequest + |\CWp8StringManagerClass provides some special StringMethods + oCApp + oCConstAccess to Constants.rex + oCLocalizedStringsLocalized strings. + oCMainModel< T >Base model io handling class. + \CThemelizedIconsTheme icons. @@ -299,7 +298,7 @@ $(document).ready(function(){initNavTree('annotated.html','');});