From fa43bc9d26c7b9ec2b07e2d3e1a7f07abe68da5b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 15 五月 2025 14:46:59 +0800
Subject: [PATCH] 导入

---
 DevApp/Gs.DevApp/DevFrm/FrmLogin.cs |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index 310adde..d1089b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -51,7 +51,6 @@
                 txtUser.Focus();
                 return;
             }
-
             if (string.IsNullOrEmpty(txtPwd.Text.Trim()))
             {
                 MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
@@ -90,7 +89,7 @@
             catch (Exception ex)
             {
                 DialogResult = DialogResult.Cancel;
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -110,7 +109,7 @@
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
         /// <summary>
@@ -133,12 +132,14 @@
                 DevExpress.XtraEditors.WindowsFormsSettings.DefaultMenuFont = new System.Drawing.Font(ary[0], _ft);
                 DevExpress.XtraEditors.WindowsFormsSettings.DefaultPrintFont = new System.Drawing.Font(ary[0], _ft);
                 #endregion
-              
             }
-            catch (Exception)
+            catch (Exception ex)
             {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
+
+        #region 鑷姩鏇存柊
         private void _autoUpdate()
         {
             _version = ConfigurationManager.AppSettings["Version"];
@@ -146,7 +147,6 @@
             AutoUpdater.Start(ConfigurationManager.AppSettings["AutoUpdaterXml"]);
             AutoUpdater.CheckForUpdateEvent += AutoUpdater_CheckForUpdateEvent;
         }
-
         private void AutoUpdater_CheckForUpdateEvent(UpdateInfoEventArgs args)
         {
             if (args == null || string.IsNullOrEmpty(args.DownloadURL))
@@ -156,12 +156,10 @@
                 Application.Exit();
                 return;
             }
-
             if (!args.IsUpdateAvailable)
             {
                 return;
             }
-
             var _strMsg =
                 string.Format(
                     $@"鏈夋柊鐗堟湰 {args.CurrentVersion} 鍙敤锛屾偍浣跨敤鐨勬槸 {args.InstalledVersion}鐗堟湰锛岃繖鏄繀闇�鐨勬洿鏂帮紝鎸夆�滄槸锛圷锛夆�濆紑濮嬫洿鏂板簲鐢ㄧ▼搴忋��");
@@ -171,7 +169,6 @@
                 Application.Exit();
                 return;
             }
-
             try
             {
                 if (AutoUpdater.DownloadUpdate(args))
@@ -193,7 +190,6 @@
                         config.Save(ConfigurationSaveMode.Modified);
                         ConfigurationManager.RefreshSection("appSettings");
                     }
-
                     Application.Exit();
                 }
                 else
@@ -211,6 +207,13 @@
             }
         }
 
+        #endregion
+
+
+        /// <summary>
+        /// 璇诲彇mac
+        /// </summary>
+        /// <returns></returns>
         private string GetMacAddress()
         {
             System.Text.StringBuilder sb = new System.Text.StringBuilder();

--
Gitblit v1.9.3