From 4dff0422d36233abbdac5ebf628365b724a906b5 Mon Sep 17 00:00:00 2001
From: yantian yue <306727702@qq.com>
Date: 星期五, 29 十二月 2023 10:31:19 +0800
Subject: [PATCH] 更新
---
YX/wt/FrmExpress.cs | 14 +++++++-------
YX/wt/Frmwt.Designer.cs | 2 +-
YX/wt/Frmwt.cs | 2 +-
YX/obj/Debug/YX.csproj.FileListAbsolute.txt | 2 +-
YX/obj/Debug/YX.exe | 0
YX/bin/Debug/YX.exe | 0
.vs/YX/v16/.suo | 0
YX/obj/Debug/YX.pdb | 0
YX/bin/Debug/YX.pdb | 0
YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache | 0
YX/obj/Debug/YX.Frmwt.resources | 0
11 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.vs/YX/v16/.suo b/.vs/YX/v16/.suo
index f83713f..ad0ff8b 100644
--- a/.vs/YX/v16/.suo
+++ b/.vs/YX/v16/.suo
Binary files differ
diff --git a/YX/bin/Debug/YX.exe b/YX/bin/Debug/YX.exe
index c255fa0..ef40b75 100644
--- a/YX/bin/Debug/YX.exe
+++ b/YX/bin/Debug/YX.exe
Binary files differ
diff --git a/YX/bin/Debug/YX.pdb b/YX/bin/Debug/YX.pdb
index 428d8e5..0cc5b54 100644
--- a/YX/bin/Debug/YX.pdb
+++ b/YX/bin/Debug/YX.pdb
Binary files differ
diff --git a/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 66ec07a..117af10 100644
--- a/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/YX/obj/Debug/YX.wt.Frmwt.resources b/YX/obj/Debug/YX.Frmwt.resources
similarity index 100%
rename from YX/obj/Debug/YX.wt.Frmwt.resources
rename to YX/obj/Debug/YX.Frmwt.resources
Binary files differ
diff --git a/YX/obj/Debug/YX.csproj.FileListAbsolute.txt b/YX/obj/Debug/YX.csproj.FileListAbsolute.txt
index 7234b5e..5baad0d 100644
--- a/YX/obj/Debug/YX.csproj.FileListAbsolute.txt
+++ b/YX/obj/Debug/YX.csproj.FileListAbsolute.txt
@@ -163,9 +163,9 @@
D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.FrmUserInfoEdit.resources
D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.Properties.Resources.resources
D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.WindowParent.resources
-D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.wt.Frmwt.resources
D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.csproj.GenerateResource.cache
D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.csproj.CoreCompileInputs.cache
D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.csproj.CopyComplete
D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.exe
D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.pdb
+D:\椤圭洰璧勬枡\闂绘嘲椤圭洰\XY\YX\obj\Debug\YX.Frmwt.resources
diff --git a/YX/obj/Debug/YX.exe b/YX/obj/Debug/YX.exe
index c255fa0..ef40b75 100644
--- a/YX/obj/Debug/YX.exe
+++ b/YX/obj/Debug/YX.exe
Binary files differ
diff --git a/YX/obj/Debug/YX.pdb b/YX/obj/Debug/YX.pdb
index 428d8e5..0cc5b54 100644
--- a/YX/obj/Debug/YX.pdb
+++ b/YX/obj/Debug/YX.pdb
Binary files differ
diff --git a/YX/wt/FrmExpress.cs b/YX/wt/FrmExpress.cs
index aec97a7..884c886 100644
--- a/YX/wt/FrmExpress.cs
+++ b/YX/wt/FrmExpress.cs
@@ -50,7 +50,7 @@
{
Console.WriteLine($"鍙戠敓閿欒锛歿ex}");
}
- dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "绉伴噸");
+ dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "logo鏈�");
macBox.Text = GetMacByNetworkInterface();
}
private void ReceiveSerialData()
@@ -237,7 +237,7 @@
CreateUserName = FrmLogin.loginUserName,
LocalIP = FrmLogin.LocalIP,
LogMessage = "WI6027璋冪敤澶辫触锛�",
- Type = "绉伴噸",
+ Type = "logo鏈�",
ClassName = typeof(FrmLogin).ToString()
});
return;
@@ -262,13 +262,13 @@
CreateUserName = FrmLogin.loginUserName,
LocalIP = FrmLogin.LocalIP,
LogMessage = "PSN:"+b_str[0]+ "杩囩珯鎴愬姛锛�",
- Type = "绉伴噸",
+ Type = "logo鏈�",
ClassName = typeof(FrmLogin).ToString()
});
}
}
}
- dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "绉伴噸");
+ dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "logo鏈�");
Refresh();
}
@@ -350,7 +350,7 @@
CreateUserName = FrmLogin.loginUserName,
LocalIP = FrmLogin.LocalIP,
LogMessage = "WI601K鎺ュ彛璋冪敤澶辫触锛�" + jo["content"].ToString(),
- Type = "绉伴噸",
+ Type = "logo鏈�",
ClassName = typeof(FrmLogin).ToString()
});
return false;
@@ -381,7 +381,7 @@
CreateUserName = FrmLogin.loginUserName,
LocalIP = FrmLogin.LocalIP,
LogMessage = "WI1032鎺ュ彛璋冪敤澶辫触锛�" + jo["content"].ToString(),
- Type = "绉伴噸",
+ Type = "logo鏈�",
ClassName = typeof(FrmLogin).ToString()
});
return null;
@@ -438,7 +438,7 @@
CreateUserName = FrmLogin.loginUserName,
LocalIP = FrmLogin.LocalIP,
LogMessage = "WI6041鎺ュ彛璋冪敤澶辫触锛�" + jo["content"].ToString(),
- Type = "绉伴噸",
+ Type = "logo鏈�",
ClassName = typeof(FrmLogin).ToString()
});
return false;
diff --git a/YX/wt/Frmwt.Designer.cs b/YX/wt/Frmwt.Designer.cs
index 41ff40b..cdbb303 100644
--- a/YX/wt/Frmwt.Designer.cs
+++ b/YX/wt/Frmwt.Designer.cs
@@ -1,5 +1,5 @@
锘�
-namespace YX.wt
+namespace YX
{
partial class Frmwt
{
diff --git a/YX/wt/Frmwt.cs b/YX/wt/Frmwt.cs
index 6cdb2e4..1871bba 100644
--- a/YX/wt/Frmwt.cs
+++ b/YX/wt/Frmwt.cs
@@ -17,7 +17,7 @@
using System.IO.Ports;
using System.Net.NetworkInformation;
-namespace YX.wt
+namespace YX
{
public partial class Frmwt : WindowParent
{
--
Gitblit v1.9.3