各种细节优化

kagurazakayashi · Mar 9, 2021 · 5db5168 · 5db5168
1 parent 3d490d9
commit 5db5168
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 107 deletions.
diff --git a/MFAScreenLock/ImageControl/Properties/AssemblyInfo.cs b/MFAScreenLock/ImageControl/Properties/AssemblyInfo.cs
@@ -5,13 +5,13 @@
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("雅诗动态密码锁定工具")]
+[assembly: AssemblyTitle("NyarukoMFALock")]
 [assembly: AssemblyDescription("图片处理工具")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("神楽坂雅詩")]
 [assembly: AssemblyProduct("设备锁定器4")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
-[assembly: AssemblyTrademark("https://github.com/kagurazakayashi/MFAScreenLock/blob/master/LICENSE")]
+[assembly: AssemblyCopyright("https://github.com/kagurazakayashi/MFAScreenLock/blob/master/LICENSE")]
+[assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 会使此程序集中的类型
@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.3.0.0")]
-[assembly: AssemblyFileVersion("4.3.0.0")]
+[assembly: AssemblyVersion("4.5.0.0")]
+[assembly: AssemblyFileVersion("4.5.0.0")]
diff --git a/MFAScreenLock/MFAScreenLockApp/About.Designer.cs b/MFAScreenLock/MFAScreenLockApp/About.Designer.cs
diff --git a/MFAScreenLock/MFAScreenLockApp/About.cs b/MFAScreenLock/MFAScreenLockApp/About.cs
@@ -62,20 +62,21 @@ private void About_Load(object sender, EventArgs e)
             formLockSubList.Add("系统内存: " + Environment.SystemPageSize.ToString());
             formLockSubList.Add("启动模式: " + SystemInformation.BootMode.ToString());
             formLockSubList.Add("系统目录: " + Environment.SystemDirectory);
-            formLockSubList.Add("主显示器分辨率: " + SystemInformation.PrimaryMonitorMaximizedWindowSize.Width.ToString() + " x " + SystemInformation.PrimaryMonitorMaximizedWindowSize.Height.ToString() + " (当前 " + SystemInformation.PrimaryMonitorSize.Width.ToString() + " x " + SystemInformation.PrimaryMonitorSize.Height.ToString() + " )");
+            formLockSubList.Add("主显示器分辨率: " + SystemInformation.PrimaryMonitorSize.Width.ToString() + " x " + SystemInformation.PrimaryMonitorSize.Height.ToString() + " (可用区域 " + SystemInformation.PrimaryMonitorMaximizedWindowSize.Width.ToString() + " x " + SystemInformation.PrimaryMonitorMaximizedWindowSize.Height.ToString() + " )");
             formLockSubList.Add("显示器 ( " + SystemInformation.MonitorCount.ToString() + " ):");
             Screen[] screens = Screen.AllScreens;
             uint screenI = 1;
             foreach (Screen screen in screens)
             {
                 Rectangle area = screen.WorkingArea;
+                Rectangle bound = screen.Bounds;
                 FormLockSub locksub = new FormLockSub();
                 string primary = "";
                 if (screen.Primary)
                 {
                     primary = "(主显示器)";
                 }
-                formLockSubList.Add("显示器 " + (screenI++).ToString() + " " + primary + ":  位置 " + area.Top.ToString() + " , " + area.Left.ToString() + "  区域 " + area.Size.Width + " x " + area.Size.Height);
+                formLockSubList.Add("显示器 " + (screenI++).ToString() + " " + primary + ":　位置 " + bound.Top.ToString() + " , " + bound.Left.ToString() + "　区域位置 " + area.Top.ToString() + " , " + area.Left.ToString() + "　分辨率 " + bound.Size.Width.ToString() + " x " + bound.Size.Height.ToString() + "　区域 " + area.Size.Width.ToString() + " x " + area.Size.Height.ToString());
             }
             foreach (string line in formLockSubList)
             {

diff --git a/MFAScreenLock/MFAScreenLockApp/Form1.cs b/MFAScreenLock/MFAScreenLockApp/Form1.cs
@@ -27,12 +27,12 @@ public Form1()
 
         private void Form1_Load(object sender, EventArgs e)
         {
-            this.BeginInvoke(new Action(() => {
+            BeginInvoke(new Action(() => {
                 Hide();
             }));
             版本ToolStripMenuItem.Text = "版本：" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
-            string programname = System.Diagnostics.Process.GetCurrentProcess().ProcessName;
-            System.Diagnostics.Process[] myProcesses = System.Diagnostics.Process.GetProcessesByName(programname);//获取指定的进程名
+            string programname = Process.GetCurrentProcess().ProcessName;
+            Process[] myProcesses = Process.GetProcessesByName(programname);//获取指定的进程名
             wallPaperBmp = ShareClass.gWallPaperBmp();
             args = Environment.GetCommandLineArgs();
             if (loadConfig() && myProcesses.Length > 1) //如果可以获取到知道的进程名则说明已经启动
@@ -55,30 +55,37 @@ private bool loadConfig()
                 if (result == DialogResult.Yes)
                 {
                     Settings.Default.Reset();
+                    Restart();
+                    return false;
                 }
-                notifyIcon1.Visible = false;
-                Application.Exit();
             }
             if (Settings.Default.MachineName == "")
             {
                 timer_lock.Enabled = false;
                 FormUser formuser = new FormUser();
-                formuser.ShowDialog();
-                if (formuser.ws == 1)
+                formuser.ws = 0;
+                bool bindMode = false;
+                if (Settings.Default.MachineName.Length == 0)
                 {
-                    notifyIcon1.Visible = false;
-                    Application.Exit();
+                    bindMode = true;
                 }
-                else
+                formuser.ShowDialog();
+                if (!(bindMode && Settings.Default.MachineName.Length > 0))
                 {
-                    if (args.Length > 1 && args[1] == "-e")
+                    if (formuser.ws == 1)
                     {
                         notifyIcon1.Visible = false;
                         Application.Exit();
                     }
-                    this.BeginInvoke(new Action(() => {
+                    else
+                    {
+                        if (args.Length > 1 && args[1] == "-e")
+                        {
+                            notifyIcon1.Visible = false;
+                            Application.Exit();
+                        }
                         Close();
-                    }));
+                    }
                 }
                 formuser.ws = 0;
                 timer_lock.Enabled = true;
@@ -135,14 +142,15 @@ private void lockallscreen(bool islock = true, Bitmap wallPaperBmp = null)
                         continue;
                     }
                     Rectangle area = screen.WorkingArea;
+                    Rectangle bound = screen.Bounds;
                     FormLockSub locksub = new FormLockSub();
                     locksub.Top = area.Top;
                     locksub.Left = area.Left;
                     locksub.Show();
                     locksub.WindowState = FormWindowState.Maximized;
                     if (!screen.Primary)
                     {
-                        locksub.setBackgroundImage(wallPaperBmp, area.Size);
+                        locksub.setBackgroundImage(wallPaperBmp, bound.Size);
                     }
                     formLockSubList.Add(locksub);
                 }

diff --git a/MFAScreenLock/MFAScreenLockApp/FormLock.cs b/MFAScreenLock/MFAScreenLockApp/FormLock.cs
@@ -62,7 +62,7 @@ public void setBackgroundImage(Bitmap newWallPaperBmp)
 
         private void FormLock_Load(object sender, EventArgs e)
         {
-            if (Settings.Default.AccountSecretKey == "")
+            if (!previewMode && Settings.Default.AccountSecretKey == "")
             {
                 ws = 1;
                 aClose();
@@ -345,6 +345,7 @@ private void timer_err_Tick(object sender, EventArgs e)
                 btn_enter.Text = "→";
                 timer_err.Enabled = false;
                 pwdEnableNow = 0;
+                txt_pwdcode.Focus();
             }
             else
             {

diff --git a/MFAScreenLock/MFAScreenLockApp/FormUser.cs b/MFAScreenLock/MFAScreenLockApp/FormUser.cs
@@ -222,7 +222,7 @@ private void showPreview()
             formlock.lbl_info.Text = formlock.Text;
             formlock.setBackgroundImage(ShareClass.gWallPaperBmp());
             formlock.previewMode = true;
-            formlock.FormBorderStyle = FormBorderStyle.Fixed3D;
+            //formlock.FormBorderStyle = FormBorderStyle.Fixed3D;
             formlock.ControlBox = true;
             formlock.MaximizeBox = true;
             formlock.TopMost = false;

diff --git a/MFAScreenLock/MFAScreenLockApp/LICENSE b/MFAScreenLock/MFAScreenLockApp/LICENSE
diff --git a/MFAScreenLock/MFAScreenLockApp/MFAScreenLockApp.csproj b/MFAScreenLock/MFAScreenLockApp/MFAScreenLockApp.csproj
@@ -27,12 +27,12 @@
     <MapFileExtensions>true</MapFileExtensions>
     <SupportUrl>https://github.com/kagurazakayashi/MFAScreenLock</SupportUrl>
     <ErrorReportUrl>https://github.com/kagurazakayashi/MFAScreenLock/issues</ErrorReportUrl>
-    <TargetCulture>zh</TargetCulture>
-    <ProductName>雅诗动态密码锁定工具</ProductName>
-    <PublisherName>北京篝火网络科技有限公司</PublisherName>
-    <SuiteName>霄霄设备锁定器4</SuiteName>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <TargetCulture>zh-Hans</TargetCulture>
+    <ProductName>NyarukoMFALock</ProductName>
+    <PublisherName>神楽坂雅詩</PublisherName>
+    <SuiteName>设备锁定器4</SuiteName>
+    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationVersion>4.5.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -71,7 +71,7 @@
     <ManifestKeyFile>MFAScreenLockApp_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>false</GenerateManifests>
+    <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <TargetZone>LocalIntranet</TargetZone>
@@ -186,9 +186,6 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <None Include="app.config" />
-    <None Include="LICENSE">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="MFAScreenLockApp_TemporaryKey.pfx" />
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
@@ -203,9 +200,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="README.md">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="Resources\ic_lock_2x.png" />
   </ItemGroup>
   <ItemGroup>

diff --git a/MFAScreenLock/MFAScreenLockApp/Properties/AssemblyInfo.cs b/MFAScreenLock/MFAScreenLockApp/Properties/AssemblyInfo.cs
@@ -6,8 +6,8 @@
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("雅诗动态密码锁定工具")]
-[assembly: AssemblyDescription("使用谷歌验证器锁定电脑")]
+[assembly: AssemblyTitle("NyarukoMFALock")]
+[assembly: AssemblyDescription("雅诗动态密码锁定工具：使用谷歌验证器锁定电脑")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("神楽坂雅詩")]
 [assembly: AssemblyProduct("设备锁定器4")]

diff --git a/MFAScreenLock/MFAScreenLockApp/README.md b/MFAScreenLock/MFAScreenLockApp/README.md
diff --git a/MFAScreenLock/SysLink/Properties/AssemblyInfo.cs b/MFAScreenLock/SysLink/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("雅诗动态密码锁定工具")]
+[assembly: AssemblyTitle("NyarukoMFALock")]
 [assembly: AssemblyDescription("系统库连接工具")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("神楽坂雅詩")]
@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.3.0.0")]
-[assembly: AssemblyFileVersion("4.3.0.0")]
+[assembly: AssemblyVersion("4.5.0.0")]
+[assembly: AssemblyFileVersion("4.5.0.0")]