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 |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index ee1506b..d1089b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -1,5 +1,6 @@
 锘縰sing AutoUpdaterDotNET;
 using DevExpress.XtraEditors;
+using DevExpress.XtraRichEdit.Export.Rtf;
 using Gs.DevApp.Entity;
 using Gs.DevApp.Properties;
 using Gs.DevApp.ToolBox;
@@ -18,18 +19,23 @@
 {
     public partial class FrmLogin : XtraForm
     {
+        private string _productName = "";
+        private string _version = "鏈煡";
+        private string _strFont = "";
+        private string _webApiUrl = "";
         public FrmLogin()
         {
 
             InitializeComponent();
+            _productName = ConfigurationManager.AppSettings["ProductName"];
+            _webApiUrl = ConfigurationManager.AppSettings["WebApiUrl"];
             if (ConfigurationManager.AppSettings["IsAutoUpdater"] == "1")
                 _autoUpdate();
             _getFont();
             _getRemember();
-            Text = lbVersion.Text = ConfigurationManager.AppSettings["ProductName"];
             btnLogin.Click += BtnLogin_Click;
             btnCancel.Click += BtnCancel_Click;
-
+            lbVersion.Text = _productName+ "锛岀増鏈�(" + _version + ")" + "锛屼娇鐢ㄥ瓧浣�(" + _strFont + ")"+"锛屾湇鍔″湴鍧�("+ _webApiUrl + ")";
         }
 
         private void BtnCancel_Click(object sender, EventArgs e)
@@ -45,7 +51,6 @@
                 txtUser.Focus();
                 return;
             }
-
             if (string.IsNullOrEmpty(txtPwd.Text.Trim()))
             {
                 MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
@@ -84,7 +89,7 @@
             catch (Exception ex)
             {
                 DialogResult = DialogResult.Cancel;
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -104,7 +109,7 @@
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
         /// <summary>
@@ -114,10 +119,10 @@
         {
             try
             {
-                string strFont = Settings.Default.fontSizeName;
-                if (string.IsNullOrEmpty(strFont))
+                _strFont = Settings.Default.fontSizeName;
+                if (string.IsNullOrEmpty(_strFont))
                     return;
-                string[] ary = strFont.Split(',');
+                string[] ary = _strFont.Split(',');
                 if (ary.Length < 2)
                     return;
                 float _ft = float.Parse(ary[1]);
@@ -128,18 +133,20 @@
                 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()
         {
-            var _version = ConfigurationManager.AppSettings["Version"];
+            _version = ConfigurationManager.AppSettings["Version"];
             AutoUpdater.InstalledVersion = new Version(_version);
             AutoUpdater.Start(ConfigurationManager.AppSettings["AutoUpdaterXml"]);
             AutoUpdater.CheckForUpdateEvent += AutoUpdater_CheckForUpdateEvent;
         }
-
         private void AutoUpdater_CheckForUpdateEvent(UpdateInfoEventArgs args)
         {
             if (args == null || string.IsNullOrEmpty(args.DownloadURL))
@@ -149,12 +156,10 @@
                 Application.Exit();
                 return;
             }
-
             if (!args.IsUpdateAvailable)
             {
                 return;
             }
-
             var _strMsg =
                 string.Format(
                     $@"鏈夋柊鐗堟湰 {args.CurrentVersion} 鍙敤锛屾偍浣跨敤鐨勬槸 {args.InstalledVersion}鐗堟湰锛岃繖鏄繀闇�鐨勬洿鏂帮紝鎸夆�滄槸锛圷锛夆�濆紑濮嬫洿鏂板簲鐢ㄧ▼搴忋��");
@@ -164,7 +169,6 @@
                 Application.Exit();
                 return;
             }
-
             try
             {
                 if (AutoUpdater.DownloadUpdate(args))
@@ -186,7 +190,6 @@
                         config.Save(ConfigurationSaveMode.Modified);
                         ConfigurationManager.RefreshSection("appSettings");
                     }
-
                     Application.Exit();
                 }
                 else
@@ -204,6 +207,13 @@
             }
         }
 
+        #endregion
+
+
+        /// <summary>
+        /// 璇诲彇mac
+        /// </summary>
+        /// <returns></returns>
         private string GetMacAddress()
         {
             System.Text.StringBuilder sb = new System.Text.StringBuilder();

--
Gitblit v1.9.3