update

TeamAAS-VM/ViewModels/MainWindowViewModel.cs

@@ -293,59 +293,66 @@ namespace TeamAAS_VP.ViewModels
             _configService.SetCurrentLanguage(CurrentLanguage);
             MyTitle = systemconfig.Title;
             CompanyTitle = systemconfig.CompanyTitle;
-            AppVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            if (systemconfig.SoftwareVersion != "")
+            {
+                AppVersion = systemconfig.SoftwareVersion;
+            }
+            else
+            {
+                AppVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            }
             systemconfig.SoftwareVersion = AppVersion;
             _configService.SaveSystemConfiguration(systemconfig);
 
 
             // 设置语言
             #region 设置语言
-            var currentlanguage = _configService.GetSystemConfiguration().CurrentLanguage;
-            if (currentlanguage == Enums.Language.ChineseSimplified)
-            {
-                var culture = new CultureInfo("zh-CN");
-                App.Current.Dispatcher.Thread.CurrentCulture = culture;
-                App.Current.Dispatcher.Thread.CurrentUICulture = culture;
-                LocalizeDictionary.Instance.Culture = culture;
-                Lang.Culture = culture;
-                Application.Current.Resources["DefaultFont"] = new System.Windows.Media.FontFamily("Microsoft YaHei");
-            }
-            else if (currentlanguage == Enums.Language.ChineseTraditional)
-            {
-                var culture = new CultureInfo("zh-TW");
-                App.Current.Dispatcher.Thread.CurrentCulture = culture;
-                App.Current.Dispatcher.Thread.CurrentUICulture = culture;
-                LocalizeDictionary.Instance.Culture = culture;
-                Lang.Culture = culture;
-                Application.Current.Resources["DefaultFont"] = new System.Windows.Media.FontFamily("Microsoft YaHei");
-            }
-            else if (currentlanguage == Enums.Language.English)
-            {
-                var culture = new CultureInfo("en");
-                App.Current.Dispatcher.Thread.CurrentCulture = culture;
-                App.Current.Dispatcher.Thread.CurrentUICulture = culture;
-                LocalizeDictionary.Instance.Culture = culture;
-                Lang.Culture = culture;
-                Application.Current.Resources["DefaultFont"] = new System.Windows.Media.FontFamily("Segoe UI");
-            }
-            else if (currentlanguage == Enums.Language.Japanese)
-            {
-                var culture = new CultureInfo("ja-JP");
-                App.Current.Dispatcher.Thread.CurrentCulture = culture;
-                App.Current.Dispatcher.Thread.CurrentUICulture = culture;
-                LocalizeDictionary.Instance.Culture = culture;
-                Lang.Culture = culture;
-                Application.Current.Resources["DefaultFont"] = new System.Windows.Media.FontFamily("Segoe UI");
-            }
-            else if (currentlanguage == Enums.Language.Vietnamese)
-            {
-                var culture = new CultureInfo("vi");
-                App.Current.Dispatcher.Thread.CurrentCulture = culture;
-                App.Current.Dispatcher.Thread.CurrentUICulture = culture;
-                LocalizeDictionary.Instance.Culture = culture;
-                Lang.Culture = culture;
-                Application.Current.Resources["DefaultFont"] = new System.Windows.Media.FontFamily("Segoe UI");
-            }
+            //var currentlanguage = _configService.GetSystemConfiguration().CurrentLanguage;
+            //if (currentlanguage == Enums.Language.ChineseSimplified)
+            //{
+            //    var culture = new CultureInfo("zh-CN");
+            //    App.Current.Dispatcher.Thread.CurrentCulture = culture;
+            //    App.Current.Dispatcher.Thread.CurrentUICulture = culture;
+            //    LocalizeDictionary.Instance.Culture = culture;
+            //    Lang.Culture = culture;
+            //    Application.Current.Resources["DefaultFont"] = new System.Windows.Media.FontFamily("Microsoft YaHei");
+            //}
+            //else if (currentlanguage == Enums.Language.ChineseTraditional)
+            //{
+            //    var culture = new CultureInfo("zh-TW");
+            //    App.Current.Dispatcher.Thread.CurrentCulture = culture;
+            //    App.Current.Dispatcher.Thread.CurrentUICulture = culture;
+            //    LocalizeDictionary.Instance.Culture = culture;
+            //    Lang.Culture = culture;
+            //    Application.Current.Resources["DefaultFont"] = new System.Windows.Media.FontFamily("Microsoft YaHei");
+            //}
+            //else if (currentlanguage == Enums.Language.English)
+            //{
+            //    var culture = new CultureInfo("en");
+            //    App.Current.Dispatcher.Thread.CurrentCulture = culture;
+            //    App.Current.Dispatcher.Thread.CurrentUICulture = culture;
+            //    LocalizeDictionary.Instance.Culture = culture;
+            //    Lang.Culture = culture;
+            //    Application.Current.Resources["DefaultFont"] = new System.Windows.Media.FontFamily("Segoe UI");
+            //}
+            //else if (currentlanguage == Enums.Language.Japanese)
+            //{
+            //    var culture = new CultureInfo("ja-JP");
+            //    App.Current.Dispatcher.Thread.CurrentCulture = culture;
+            //    App.Current.Dispatcher.Thread.CurrentUICulture = culture;
+            //    LocalizeDictionary.Instance.Culture = culture;
+            //    Lang.Culture = culture;
+            //    Application.Current.Resources["DefaultFont"] = new System.Windows.Media.FontFamily("Segoe UI");
+            //}
+            //else if (currentlanguage == Enums.Language.Vietnamese)
+            //{
+            //    var culture = new CultureInfo("vi");
+            //    App.Current.Dispatcher.Thread.CurrentCulture = culture;
+            //    App.Current.Dispatcher.Thread.CurrentUICulture = culture;
+            //    LocalizeDictionary.Instance.Culture = culture;
+            //    Lang.Culture = culture;
+            //    Application.Current.Resources["DefaultFont"] = new System.Windows.Media.FontFamily("Segoe UI");
+            //}
             #endregion
 
             SendTaskMessage(Lang.软件启动, MessageLevel.Info);