From e67f92c7009bb2680cd0e3d57de9323be7613a12 Mon Sep 17 00:00:00 2001
From: "nodyang@aliyun.com" <nodyang@aliyun.com>
Date: Thu, 14 Nov 2024 08:52:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E6=98=A8=E5=A4=A9=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RfidWeb/FormMain.cs          |  20 ++++++++++----------
 RfidWeb/Frm/UserAlarmShow.cs |   5 ++++-
 RfidWeb/RfidWeb.csproj       |  31 +++++++++++++++++++++++++++++++
 RfidWeb/logo.ico             | Bin 0 -> 67646 bytes
 4 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 RfidWeb/logo.ico

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 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,6 +47,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>logo.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Chloe">
       <Version>5.40.0</Version>
@@ -255,6 +273,7 @@
   <ItemGroup>
     <None Include="Resources\左箭头.png" />
     <None Include="Resources\右箭头.png" />
+    <Content Include="logo.ico" />
     <Content Include="read.txt" />
     <None Include="Resources\海威图标在上.jpg" />
     <None Include="Resources\log.png" />
@@ -262,5 +281,17 @@
     <Content Include="Resources\照明开.png" />
     <None Include="Resources\脱机.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/RfidWeb/logo.ico b/RfidWeb/logo.ico
new file mode 100644
index 0000000000000000000000000000000000000000..ca9609ddc287991aed9638384f90df554b5ebcc5
GIT binary patch
literal 67646
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
VIQsY%@88|g$FH%z&#mwK{{jT8e#ig-

literal 0
HcmV?d00001