From 329e5525e3f7096e6c063aa38043d8d737d72b8c Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 30 Sep 2013 11:01:57 +0200 Subject: [PATCH] fix #205 --- CampusAppWP8/CampusAppWP8/App.xaml.cs | 9 ++++++++- .../CampusAppWP8/Model/Setting/AppSettings.cs | 15 +++++++++++++++ .../CampusAppWP8/Pages/StartPage.xaml.cs | 7 +++++++ .../CampusAppWP8/Resources/Constants.resx | 6 ++++++ .../Resources/Constants1.Designer.cs | 18 ++++++++++++++++++ 5 files changed, 54 insertions(+), 1 deletion(-) diff --git a/CampusAppWP8/CampusAppWP8/App.xaml.cs b/CampusAppWP8/CampusAppWP8/App.xaml.cs index 23949af1..81f3a560 100644 --- a/CampusAppWP8/CampusAppWP8/App.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/App.xaml.cs @@ -147,7 +147,14 @@ namespace CampusAppWP8 } else { - Settings.AppSetting.DevMode = true; + Settings.AppSetting.DevMode = false; + } + + int appDeploy; + bool parseResult = int.TryParse(Constants.DeploymentNumber, out appDeploy); + if (!parseResult || Settings.AppSetting.DeploymentNumber != appDeploy) + { + Settings.AppSetting.InitApp = false; } this.UserSettingsLoaded(); diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs index d12e961a..235a0508 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs @@ -109,6 +109,21 @@ namespace CampusAppWP8.Model.Setting } } + /// + /// Gets or sets the DeploymentNumber of the app + /// + public int DeploymentNumber + { + get + { + return App.LoadFromAppState(Constants.AppSetting_DeploymentNumber); + } + set + { + App.SaveToAppState(Constants.AppSetting_DeploymentNumber,value); + } + } + #endregion } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index 9f58635d..fb4dfb53 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -83,6 +83,13 @@ namespace CampusAppWP8.Pages this.initCourseList.LoadData(); this.ShowOptIns(); Settings.AppSetting.InitApp = true; + + int appDeploy; + bool parseResult = int.TryParse(Constants.DeploymentNumber, out appDeploy); + if (parseResult) + { + Settings.AppSetting.DeploymentNumber = appDeploy; + } } } diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index da484cb4..addf67af 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -552,4 +552,10 @@ SearchPin + + DeploymentNumber + + + 2 + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index 2ed1f9a6..00e4ee3e 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -105,6 +105,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die DeploymentNumber ähnelt. + /// + public static string AppSetting_DeploymentNumber { + get { + return ResourceManager.GetString("AppSetting_DeploymentNumber", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die DevMode ähnelt. /// @@ -186,6 +195,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die 2 ähnelt. + /// + public static string DeploymentNumber { + get { + return ResourceManager.GetString("DeploymentNumber", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die +49 ähnelt. ///