From db9fc85acf9671e936092656e06d809ffe448538 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 六月 2025 18:12:08 +0800
Subject: [PATCH] 加上自动生成按钮

---
 DevApp/Gs.DevApp/DevFrm/FrmLogin.cs |   67 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index d62af1c..d9a062b 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -1,35 +1,40 @@
-锘縰sing System;
-using System.Configuration;
-using System.Linq;
-using System.Management;
-using System.Net.Sockets;
-using System.Net;
-using System.Windows.Forms;
-using AutoUpdaterDotNET;
+锘縰sing AutoUpdaterDotNET;
 using DevExpress.XtraEditors;
 using Gs.DevApp.Entity;
 using Gs.DevApp.Properties;
 using Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System;
+using System.Configuration;
+using System.Linq;
+using System.Management;
+using System.Net;
+using System.Net.Sockets;
+using System.Windows.Forms;
 
 
 namespace Gs.DevApp.DevFrm
 {
     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 +50,6 @@
                 txtUser.Focus();
                 return;
             }
-
             if (string.IsNullOrEmpty(txtPwd.Text.Trim()))
             {
                 MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
@@ -70,6 +74,7 @@
                     Settings.Default.userName = ckRemember.Checked ? txtUser.Text.Trim() : "";
                     Settings.Default.userPwd = ckRemember.Checked ? txtPwd.Text.Trim() : "";
                     Settings.Default.remember = ckRemember.Checked;
+                    Settings.Default.isWeight = ckWeight.Checked;
                     Settings.Default.Save();
                     LoginInfoModel.CurrentUser.LoginUserGuid = _login["loginGuid"].ToString();
                     LoginInfoModel.CurrentUser.LoginTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm");
@@ -84,7 +89,7 @@
             catch (Exception ex)
             {
                 DialogResult = DialogResult.Cancel;
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -95,17 +100,16 @@
         {
             try
             {
-                if (Settings.Default.remember)
-                {
-                    txtUser.Text = Settings.Default.userName;
-                    txtPwd.Text = Settings.Default.userPwd;
-                    ckRemember.Checked = true;
-                }
+                txtUser.Text = Settings.Default.userName;
+                txtPwd.Text = Settings.Default.userPwd;
+                ckRemember.Checked = Settings.Default.remember;
+                ckWeight.Checked = Settings.Default.isWeight;
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
+          
         }
         /// <summary>
         /// 璇诲彇瀛椾綋
@@ -114,10 +118,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 +132,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 +155,10 @@
                 Application.Exit();
                 return;
             }
-
             if (!args.IsUpdateAvailable)
             {
                 return;
             }
-
             var _strMsg =
                 string.Format(
                     $@"鏈夋柊鐗堟湰 {args.CurrentVersion} 鍙敤锛屾偍浣跨敤鐨勬槸 {args.InstalledVersion}鐗堟湰锛岃繖鏄繀闇�鐨勬洿鏂帮紝鎸夆�滄槸锛圷锛夆�濆紑濮嬫洿鏂板簲鐢ㄧ▼搴忋��");
@@ -164,7 +168,6 @@
                 Application.Exit();
                 return;
             }
-
             try
             {
                 if (AutoUpdater.DownloadUpdate(args))
@@ -186,7 +189,6 @@
                         config.Save(ConfigurationSaveMode.Modified);
                         ConfigurationManager.RefreshSection("appSettings");
                     }
-
                     Application.Exit();
                 }
                 else
@@ -204,6 +206,13 @@
             }
         }
 
+        #endregion
+
+
+        /// <summary>
+        /// 璇诲彇mac
+        /// </summary>
+        /// <returns></returns>
         private string GetMacAddress()
         {
             System.Text.StringBuilder sb = new System.Text.StringBuilder();

--
Gitblit v1.9.3