From 68d84387b8654bc821c37697b8a03cd9c6d72e42 Mon Sep 17 00:00:00 2001 From: DucDangAnh Date: Fri, 17 Jul 2020 15:00:13 +0700 Subject: [PATCH 1/2] App.config - add DEFAULT_WEB_SERVER key. LoginForm - update DEFAULT_WEB_SERVER --- AIParkingApplication/App.config | 1 + AIParkingApplication/LoginForm.cs | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/AIParkingApplication/App.config b/AIParkingApplication/App.config index 78684e9..1d9296f 100644 --- a/AIParkingApplication/App.config +++ b/AIParkingApplication/App.config @@ -4,6 +4,7 @@ + diff --git a/AIParkingApplication/LoginForm.cs b/AIParkingApplication/LoginForm.cs index dad0ed6..97fbadf 100644 --- a/AIParkingApplication/LoginForm.cs +++ b/AIParkingApplication/LoginForm.cs @@ -100,6 +100,7 @@ namespace AIParkingApplication { Util.AddOrUpdateAppSettings("DEFAULT_USERNAME", txtUsername.Text); Util.AddOrUpdateAppSettings("DEFAULT_PASSWORD", txtPassword.Text); + Util.AddOrUpdateAppSettings("DEFAULT_WEB_SERVER", txtServerAddress.Text); new AIParkingApplicationForm(apiController, ipAddress, loginResult.LoginData, applicationLogger).Show(); Hide(); applicationLogger.Log(LogLevel.Info, $"Đăng nhập thành công với tài khoản: {txtUsername.Text}"); @@ -117,12 +118,11 @@ namespace AIParkingApplication { txtUsername.Text = ConfigurationManager.AppSettings["DEFAULT_USERNAME"]; txtPassword.Text = ConfigurationManager.AppSettings["DEFAULT_PASSWORD"]; + txtServerAddress.Text = ConfigurationManager.AppSettings["DEFAULT_WEB_SERVER"]; bool.TryParse(ConfigurationManager.AppSettings["AUTO_LOGIN"], out isAutoLogin); - Thread.Sleep(500); if (isAutoLogin) { chkAutoLogin.Checked = true; - lblLoginStatus.UpdateLabel("Đang đăng nhập", Color.Green, Color.White); Login(); } } @@ -133,6 +133,7 @@ namespace AIParkingApplication Util.AddOrUpdateAppSettings("DEFAULT_USERNAME", string.Empty); Util.AddOrUpdateAppSettings("DEFAULT_PASSWORD", string.Empty); Util.AddOrUpdateAppSettings("AUTO_LOGIN", "false"); + Util.AddOrUpdateAppSettings("DEFAULT_WEB_SERVER", "127.0.0.1:80"); chkAutoLogin.Checked = false; Console.WriteLine($"{DateTime.Now.GetTimeFormatted()}\tReadAccessControlDeviceIPConfiguration\t{ex.Message}"); applicationLogger.Log(LogLevel.Error, "Không thể đọc cấu hình tài khoản mặc định: DEFAULT_USERNAME, DEFAULT_PASSWORD"); From 6284909fd83af2d68f76716863ac80b616b9c1d4 Mon Sep 17 00:00:00 2001 From: DucDangAnh Date: Fri, 17 Jul 2020 15:01:16 +0700 Subject: [PATCH 2/2] Util - Rename AddOrUpdateAppSettings to UpsertAppSettings --- AIParkingApplication/AIParkingApplicationForm.cs | 12 ++++++------ AIParkingApplication/LaneOut.cs | 2 +- AIParkingApplication/LoginForm.cs | 16 ++++++++-------- AIParkingApplication/Util.cs | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/AIParkingApplication/AIParkingApplicationForm.cs b/AIParkingApplication/AIParkingApplicationForm.cs index aac0eb0..5c29cda 100644 --- a/AIParkingApplication/AIParkingApplicationForm.cs +++ b/AIParkingApplication/AIParkingApplicationForm.cs @@ -154,7 +154,7 @@ namespace AIParkingApplication private void toolStripMenuItemSwitchLaneInIn_Click(object sender, EventArgs e) { - Util.AddOrUpdateAppSettings(CURRENT_LANE_SETTING_KEY, "IN-IN"); + Util.UpsertAppSettings(CURRENT_LANE_SETTING_KEY, "IN-IN"); UpdateMenuStripItemStatus(sender as ToolStripMenuItem); StopAllLanes(); UpdateLaneInIn(); @@ -163,7 +163,7 @@ namespace AIParkingApplication private void toolStripMenuItemSwitchLaneInOut_Click(object sender, EventArgs e) { - Util.AddOrUpdateAppSettings(CURRENT_LANE_SETTING_KEY, "IN-OUT"); + Util.UpsertAppSettings(CURRENT_LANE_SETTING_KEY, "IN-OUT"); UpdateMenuStripItemStatus(sender as ToolStripMenuItem); StopAllLanes(); UpdateLaneInOut(); @@ -172,7 +172,7 @@ namespace AIParkingApplication private void toolStripMenuItemSwitchLaneOutIn_Click(object sender, EventArgs e) { - Util.AddOrUpdateAppSettings(CURRENT_LANE_SETTING_KEY, "OUT-IN"); + Util.UpsertAppSettings(CURRENT_LANE_SETTING_KEY, "OUT-IN"); UpdateMenuStripItemStatus(sender as ToolStripMenuItem); StopAllLanes(); UpdateLaneOutIn(); @@ -181,7 +181,7 @@ namespace AIParkingApplication private void toolStripMenuItemSwitchLaneOutOut_Click(object sender, EventArgs e) { - Util.AddOrUpdateAppSettings(CURRENT_LANE_SETTING_KEY, "OUT-OUT"); + Util.UpsertAppSettings(CURRENT_LANE_SETTING_KEY, "OUT-OUT"); UpdateMenuStripItemStatus(sender as ToolStripMenuItem); StopAllLanes(); UpdateLaneOutOut(); @@ -262,7 +262,7 @@ namespace AIParkingApplication } else { - Util.AddOrUpdateAppSettings(CURRENT_LANE_SETTING_KEY, "IN-OUT"); + Util.UpsertAppSettings(CURRENT_LANE_SETTING_KEY, "IN-OUT"); UpdateLaneInOut(); toolStripMenuItemSwitchLaneInOut.DisableSelected(); appLogger.Log(LogLevel.Info, $"Khởi động App đọc config không đủ 2 param: IN-OUT"); @@ -271,7 +271,7 @@ namespace AIParkingApplication } catch (Exception ex) { - Util.AddOrUpdateAppSettings(CURRENT_LANE_SETTING_KEY, "IN-OUT"); + Util.UpsertAppSettings(CURRENT_LANE_SETTING_KEY, "IN-OUT"); UpdateLaneInOut(); toolStripMenuItemSwitchLaneInOut.DisableSelected(); Console.WriteLine($"{DateTime.Now.GetTimeFormatted()}\tReadLaneSettingFromConfigurationFile\t{ex.Message}"); diff --git a/AIParkingApplication/LaneOut.cs b/AIParkingApplication/LaneOut.cs index 517dc10..b36f9c7 100644 --- a/AIParkingApplication/LaneOut.cs +++ b/AIParkingApplication/LaneOut.cs @@ -152,7 +152,7 @@ namespace AIParkingApplication } catch (Exception ex) { - Util.AddOrUpdateAppSettings("USE_PRINTER", "false"); + Util.UpsertAppSettings("USE_PRINTER", "false"); appLogger.Log(LogLevel.Error, $"Không thể đọc cấu hình: USE_PRINTER. ex: {ex.Message }"); } } diff --git a/AIParkingApplication/LoginForm.cs b/AIParkingApplication/LoginForm.cs index 97fbadf..d2d0430 100644 --- a/AIParkingApplication/LoginForm.cs +++ b/AIParkingApplication/LoginForm.cs @@ -98,9 +98,9 @@ namespace AIParkingApplication if (loginResult.IsLoginSuccess) { - Util.AddOrUpdateAppSettings("DEFAULT_USERNAME", txtUsername.Text); - Util.AddOrUpdateAppSettings("DEFAULT_PASSWORD", txtPassword.Text); - Util.AddOrUpdateAppSettings("DEFAULT_WEB_SERVER", txtServerAddress.Text); + Util.UpsertAppSettings("DEFAULT_USERNAME", txtUsername.Text); + Util.UpsertAppSettings("DEFAULT_PASSWORD", txtPassword.Text); + Util.UpsertAppSettings("DEFAULT_WEB_SERVER", txtServerAddress.Text); new AIParkingApplicationForm(apiController, ipAddress, loginResult.LoginData, applicationLogger).Show(); Hide(); applicationLogger.Log(LogLevel.Info, $"Đăng nhập thành công với tài khoản: {txtUsername.Text}"); @@ -130,10 +130,10 @@ namespace AIParkingApplication { txtUsername.Text = string.Empty; txtPassword.Text = string.Empty; - Util.AddOrUpdateAppSettings("DEFAULT_USERNAME", string.Empty); - Util.AddOrUpdateAppSettings("DEFAULT_PASSWORD", string.Empty); - Util.AddOrUpdateAppSettings("AUTO_LOGIN", "false"); - Util.AddOrUpdateAppSettings("DEFAULT_WEB_SERVER", "127.0.0.1:80"); + Util.UpsertAppSettings("DEFAULT_USERNAME", string.Empty); + Util.UpsertAppSettings("DEFAULT_PASSWORD", string.Empty); + Util.UpsertAppSettings("AUTO_LOGIN", "false"); + Util.UpsertAppSettings("DEFAULT_WEB_SERVER", "127.0.0.1:80"); chkAutoLogin.Checked = false; Console.WriteLine($"{DateTime.Now.GetTimeFormatted()}\tReadAccessControlDeviceIPConfiguration\t{ex.Message}"); applicationLogger.Log(LogLevel.Error, "Không thể đọc cấu hình tài khoản mặc định: DEFAULT_USERNAME, DEFAULT_PASSWORD"); @@ -147,7 +147,7 @@ namespace AIParkingApplication private void chkAutoLogin_CheckedChanged(object sender, EventArgs e) { - Util.AddOrUpdateAppSettings("AUTO_LOGIN", (sender as CheckBox).Checked.ToString().ToLower()); + Util.UpsertAppSettings("AUTO_LOGIN", (sender as CheckBox).Checked.ToString().ToLower()); } } } diff --git a/AIParkingApplication/Util.cs b/AIParkingApplication/Util.cs index d38286d..401547c 100644 --- a/AIParkingApplication/Util.cs +++ b/AIParkingApplication/Util.cs @@ -113,7 +113,7 @@ namespace AIParkingApplication int.TryParse(hostParts[1], out port); } - public static void AddOrUpdateAppSettings(string key, string value) + public static void UpsertAppSettings(string key, string value) { try {