diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 5f8c4d6..07f4ce6 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 5f8c4d6..07f4ce6 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/Utils/DataBaseManager.cs b/SubCabinetSolution/Utils/DataBaseManager.cs index 7040ae6..d9311f1 100644 --- a/SubCabinetSolution/Utils/DataBaseManager.cs +++ b/SubCabinetSolution/Utils/DataBaseManager.cs @@ -1,14 +1,16 @@ -using MySql.Data.MySqlClient; +using System; +using MySql.Data.MySqlClient; namespace SubCabinetSolution.Utils { public class DataBaseManager { - private static DataBaseManager _dataBase; + private static readonly Lazy Lazy = new Lazy(() => new DataBaseManager()); - public static DataBaseManager GetInstance() + public static DataBaseManager Instance => Lazy.Value; + + private DataBaseManager() { - return _dataBase ?? (_dataBase = new DataBaseManager()); } public MySqlConnection GetConnection() diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 5f8c4d6..07f4ce6 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/Utils/DataBaseManager.cs b/SubCabinetSolution/Utils/DataBaseManager.cs index 7040ae6..d9311f1 100644 --- a/SubCabinetSolution/Utils/DataBaseManager.cs +++ b/SubCabinetSolution/Utils/DataBaseManager.cs @@ -1,14 +1,16 @@ -using MySql.Data.MySqlClient; +using System; +using MySql.Data.MySqlClient; namespace SubCabinetSolution.Utils { public class DataBaseManager { - private static DataBaseManager _dataBase; + private static readonly Lazy Lazy = new Lazy(() => new DataBaseManager()); - public static DataBaseManager GetInstance() + public static DataBaseManager Instance => Lazy.Value; + + private DataBaseManager() { - return _dataBase ?? (_dataBase = new DataBaseManager()); } public MySqlConnection GetConnection() diff --git a/SubCabinetSolution/ViewModel/MainViewModel.cs b/SubCabinetSolution/ViewModel/MainViewModel.cs index 78eea5a..84127f5 100644 --- a/SubCabinetSolution/ViewModel/MainViewModel.cs +++ b/SubCabinetSolution/ViewModel/MainViewModel.cs @@ -95,7 +95,7 @@ MessageBox.Show("No video sources found", "Error", MessageBoxButton.OK, MessageBoxImage.Error); } - _connection = DataBaseManager.GetInstance().GetConnection(); + _connection = DataBaseManager.Instance.GetConnection(); LoginToMainCommand = new RelayCommand(Login); OpenCameraCommand = new RelayCommand(OpenCamera); VersionName = "版本号 Ver " + Application.ResourceAssembly.GetName().Version;