check point

Tynab · Mar 29, 2023 · 2bcd7e3 · 2bcd7e3
1 parent 0732ed3
commit 2bcd7e3
Show file tree

Hide file tree

Showing 21 changed files with 3,988 additions and 442 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+**/wwwroot/libs/** linguist-vendored
diff --git a/Loginside FYAN Bot GUI/Screen/FrmMain.Designer.cs b/Loginside FYAN Bot GUI/Screen/FrmMain.Designer.cs
diff --git a/Loginside FYAN Bot GUI/Screen/FrmMain.cs b/Loginside FYAN Bot GUI/Screen/FrmMain.cs
@@ -11,7 +11,6 @@
 using static Loginside_FYAN_Bot_GUI.Script.Constant.ServSts;
 using static System.IO.File;
 using static System.Math;
-using static System.Windows.Forms.Keys;
 using static YANF.Script.YANEvent;
 
 namespace Loginside_FYAN_Bot_GUI.Screen;
@@ -32,22 +31,6 @@ public FrmMain()
     }
     #endregion
 
-    #region Overridden
-    //hide sub windows
-    protected override CreateParams CreateParams
-    {
-        get
-        {
-            var cp = base.CreateParams;
-            cp.ExStyle |= 0x80;
-            return cp;
-        }
-    }
-
-    //disable close
-    protected override bool ProcessCmdKey(ref Message msg, Keys keyData) => keyData == (Alt | F4) || base.ProcessCmdKey(ref msg, keyData);
-    #endregion
-
     #region Events
     // frm shown
     private void FrmMain_Shown(object sender, EventArgs e)
@@ -71,6 +54,9 @@ private void FrmMain_Shown(object sender, EventArgs e)
         }
     }
 
+    // frm closed
+    private void FrmMain_FormClosed(object sender, FormClosedEventArgs e) => pnlMain?.HideAnimat(Leaf, ANIMAT_SPD);
+
     // btn Apply click
     private void BtnAdm_Click(object sender, EventArgs e)
     {
@@ -152,15 +138,15 @@ private void BtnAct_Click(object sender, EventArgs e)
         switch (GetServSts(bot_name))
         {
             case Started:
-            {
-                isScs = StopServ(bot_name, TIME_OUT);
-                break;
-            }
+                {
+                    isScs = StopServ(bot_name, TIME_OUT);
+                    break;
+                }
             case Stoped:
-            {
-                isScs = StrtServ(bot_name, TIME_OUT);
-                break;
-            }
+                {
+                    isScs = StrtServ(bot_name, TIME_OUT);
+                    break;
+                }
         }
         // re-sync
         if (isScs)
@@ -174,8 +160,7 @@ private void BtnAct_Click(object sender, EventArgs e)
     private void BtnCl_Click(object sender, EventArgs e)
     {
         // action
-        pnlMain?.HideAnimat(Leaf, ANIMAT_SPD);
-        Hide();
+        Close();
         // sound
         SND_NEXT?.PlaySync();
     }

diff --git a/Loginside FYAN Bot GUI/Screen/FrmMain.resx b/Loginside FYAN Bot GUI/Screen/FrmMain.resx
@@ -258,9 +258,6 @@
   <metadata name="tipMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="tmrMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>110, 17</value>
-  </metadata>
   <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

diff --git a/Loginside FYAN Bot Service/App.config b/Loginside FYAN Bot Service/App.config
@@ -37,7 +37,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.1.12" newVersion="1.4.1.12" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.2.13" newVersion="1.4.2.13" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

diff --git a/Loginside FYAN Bot Service/Loginside FYAN Bot Service.csproj b/Loginside FYAN Bot Service/Loginside FYAN Bot Service.csproj
@@ -116,7 +116,7 @@
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Xml" />
     <Reference Include="WebDriver, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.WebDriver.4.8.1\lib\net48\WebDriver.dll</HintPath>
+      <HintPath>..\packages\Selenium.WebDriver.4.8.2\lib\net48\WebDriver.dll</HintPath>
     </Reference>
     <Reference Include="WebDriverManager, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\WebDriverManager.2.16.2\lib\net461\WebDriverManager.dll</HintPath>
@@ -184,17 +184,17 @@
     <Content Include="ic.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Selenium.WebDriver.4.8.1\build\Selenium.WebDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.4.8.1\build\Selenium.WebDriver.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Selenium.WebDriver.4.8.1\build\Selenium.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.4.8.1\build\Selenium.WebDriver.targets'))" />
-    <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.110.0.5481.7700\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.110.0.5481.7700\build\Selenium.WebDriver.ChromeDriver.targets'))" />
     <Error Condition="!Exists('..\packages\Selenium.WebDriver.GeckoDriver.0.32.2\build\Selenium.WebDriver.GeckoDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.GeckoDriver.0.32.2\build\Selenium.WebDriver.GeckoDriver.targets'))" />
     <Error Condition="!Exists('..\packages\Selenium.WebDriver.IEDriver.4.8.1\build\Selenium.WebDriver.IEDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.IEDriver.4.8.1\build\Selenium.WebDriver.IEDriver.targets'))" />
+    <Error Condition="!Exists('..\packages\Selenium.WebDriver.4.8.2\build\Selenium.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.4.8.2\build\Selenium.WebDriver.targets'))" />
+    <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.111.0.5563.6400\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.111.0.5563.6400\build\Selenium.WebDriver.ChromeDriver.targets'))" />
   </Target>
-  <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.110.0.5481.7700\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.110.0.5481.7700\build\Selenium.WebDriver.ChromeDriver.targets')" />
   <Import Project="..\packages\Selenium.WebDriver.GeckoDriver.0.32.2\build\Selenium.WebDriver.GeckoDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.GeckoDriver.0.32.2\build\Selenium.WebDriver.GeckoDriver.targets')" />
   <Import Project="..\packages\Selenium.WebDriver.IEDriver.4.8.1\build\Selenium.WebDriver.IEDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.IEDriver.4.8.1\build\Selenium.WebDriver.IEDriver.targets')" />
+  <Import Project="..\packages\Selenium.WebDriver.4.8.2\build\Selenium.WebDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.4.8.2\build\Selenium.WebDriver.targets')" />
+  <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.111.0.5563.6400\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.111.0.5563.6400\build\Selenium.WebDriver.ChromeDriver.targets')" />
 </Project>
diff --git a/Loginside FYAN Bot Service/packages.config b/Loginside FYAN Bot Service/packages.config
@@ -3,8 +3,8 @@
   <package id="AngleSharp" version="1.0.1" targetFramework="net481" />
   <package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net481" />
   <package id="Otp.NET" version="1.3.0" targetFramework="net481" />
-  <package id="Selenium.WebDriver" version="4.8.1" targetFramework="net481" />
-  <package id="Selenium.WebDriver.ChromeDriver" version="110.0.5481.7700" targetFramework="net481" />
+  <package id="Selenium.WebDriver" version="4.8.2" targetFramework="net481" />
+  <package id="Selenium.WebDriver.ChromeDriver" version="111.0.5563.6400" targetFramework="net481" />
   <package id="Selenium.WebDriver.GeckoDriver" version="0.32.2" targetFramework="net481" />
   <package id="Selenium.WebDriver.IEDriver" version="4.8.1" targetFramework="net481" />
   <package id="Serilog" version="2.12.0" targetFramework="net481" />