diff --git a/RfidWeb/FormMain.cs b/RfidWeb/FormMain.cs
index 20f63d8..f4a312b 100644
--- a/RfidWeb/FormMain.cs
+++ b/RfidWeb/FormMain.cs
@@ -37,16 +37,16 @@ namespace RfidWeb
var rfidSetting = RfidSetting.Current;
InitializeComponent();
- //if (this.FormBorderStyle == FormBorderStyle.None)
- //{
- // this.FormBorderStyle = FormBorderStyle.FixedSingle;
- // this.WindowState = FormWindowState.Normal;
- //}
- //else
- //{
- // this.FormBorderStyle = FormBorderStyle.None;
- // this.WindowState = FormWindowState.Maximized;
- //}
+ if (this.FormBorderStyle == FormBorderStyle.None)
+ {
+ this.FormBorderStyle = FormBorderStyle.FixedSingle;
+ this.WindowState = FormWindowState.Normal;
+ }
+ else
+ {
+ this.FormBorderStyle = FormBorderStyle.None;
+ this.WindowState = FormWindowState.Maximized;
+ }
Init();
}
diff --git a/RfidWeb/Frm/UserAlarmShow.cs b/RfidWeb/Frm/UserAlarmShow.cs
index 78be568..cec9bd1 100644
--- a/RfidWeb/Frm/UserAlarmShow.cs
+++ b/RfidWeb/Frm/UserAlarmShow.cs
@@ -52,7 +52,10 @@ namespace RfidWeb.Frm
{
int currentFirstVisibleRowIndex = dataGridView1.FirstDisplayedScrollingRowIndex;
this.dataGridView1.DataSource=lsList;
- dataGridView1.FirstDisplayedScrollingRowIndex = currentFirstVisibleRowIndex;
+ if (currentFirstVisibleRowIndex > 0)
+ {
+ dataGridView1.FirstDisplayedScrollingRowIndex = currentFirstVisibleRowIndex;
+ }
});
// ThreadPoolX.QueueUserWorkItem(UpdateLog);
diff --git a/RfidWeb/RfidWeb.csproj b/RfidWeb/RfidWeb.csproj
index acdd13a..bbd2baa 100644
--- a/RfidWeb/RfidWeb.csproj
+++ b/RfidWeb/RfidWeb.csproj
@@ -12,6 +12,21 @@
512
true
true
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
AnyCPU
@@ -32,6 +47,9 @@
prompt
4
+
+ logo.ico
+
5.40.0
@@ -255,6 +273,7 @@
+
@@ -262,5 +281,17 @@
+
+
+ False
+ Microsoft .NET Framework 4.8 %28x86 和 x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
\ No newline at end of file
diff --git a/RfidWeb/logo.ico b/RfidWeb/logo.ico
new file mode 100644
index 0000000..ca9609d
Binary files /dev/null and b/RfidWeb/logo.ico differ