From cbb5315301b1490b57497212256c5255e5eb7eb6 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 01 十一月 2025 17:06:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/Toast.cs | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/Toast.cs b/DevApp/Gs.DevApp/UserControl/Toast.cs
index 811814d..ef9e5c4 100644
--- a/DevApp/Gs.DevApp/UserControl/Toast.cs
+++ b/DevApp/Gs.DevApp/UserControl/Toast.cs
@@ -1,13 +1,6 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Properties;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
+锘縰sing System;
+using System.Configuration;
using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp
@@ -17,20 +10,37 @@
private System.Windows.Forms.Timer tmr;
private System.Windows.Forms.Timer tmr2;
+
/// <summary>
///
/// </summary>
/// <param name="it">1鎴愬姛锛�-1澶辫触</param>
/// <param name="messageText"></param>
- /// <param name="vanishingSeconds"></param>
- public Toast(int it, string messageText, int vanishingSeconds = 2)
+ /// <param name="vanishingSeconds">鍔ㄧ敾寤堕暱鏃堕棿</param>
+ public Toast(int it, string messageText, int vanishingSeconds = 5)
{
InitializeComponent();
+ try
+ {
+ string _vanishingSeconds = ConfigurationManager.AppSettings["ToastSeconds"];
+ if (!string.IsNullOrEmpty(_vanishingSeconds))
+ vanishingSeconds = int.Parse(_vanishingSeconds);
+ }
+ catch (Exception)
+ {
+
+ }
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Toast));
if (it > 0)
- this.panel1.BackgroundImage = global::Gs.DevApp.Properties.Resources.ok123;
+ {
+ this.panel1.BackgroundImage = global::Gs.DevApp.Properties.Resources.ok10;
+ this.testo.Appearance.BackColor = System.Drawing.Color.SeaGreen;
+ }
else
- this.panel1.BackgroundImage = global::Gs.DevApp.Properties.Resources.error123;
+ {
+ this.panel1.BackgroundImage = global::Gs.DevApp.Properties.Resources.error10;
+ this.testo.Appearance.BackColor = System.Drawing.Color.Firebrick;
+ }
double elapsedTime = 0;
testo.Text = messageText;
double vanishingMilliSeconds = vanishingSeconds * 1000;
--
Gitblit v1.9.3