From 5a42ee73f2a044366a2407b4f673d8de5cd5a087 Mon Sep 17 00:00:00 2001 From: cgl Date: Sat, 11 Jun 2022 10:05:40 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=A7=A3=E5=86=B3CMD?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=B8=8D=E5=85=B3=E9=97=AD=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/ViewModels/SettingsViewModel.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs index d34be9f4de..5e9ac1de99 100644 --- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs +++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs @@ -228,6 +228,7 @@ namespace MeoAsstGui emuProcess.StartInfo.UseShellExecute = false; emuProcess.Start(); emuProcess.StandardInput.WriteLine(EmulatorPath); + emuProcess.Close(); int delay = 0; if (!int.TryParse(EmulatorWaitSeconds, out delay)) { From 309a005fbf9ab0a0047994e966feaf93f029d720 Mon Sep 17 00:00:00 2001 From: cgl Date: Sat, 11 Jun 2022 10:46:59 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E5=85=B3?= =?UTF-8?q?=E9=97=ADCMD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/ViewModels/SettingsViewModel.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs index 5e9ac1de99..cfbf576792 100644 --- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs +++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs @@ -228,6 +228,7 @@ namespace MeoAsstGui emuProcess.StartInfo.UseShellExecute = false; emuProcess.Start(); emuProcess.StandardInput.WriteLine(EmulatorPath); + emuProcess.StandardInput.WriteLine("exit"); emuProcess.Close(); int delay = 0; if (!int.TryParse(EmulatorWaitSeconds, out delay)) From a73a9ecfb37f74989ed66a44d23b31b6ee007aad Mon Sep 17 00:00:00 2001 From: cglcv Date: Sat, 11 Jun 2022 12:55:02 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/ViewModels/SettingsViewModel.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs index cfbf576792..583b09a1a2 100644 --- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs +++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs @@ -229,7 +229,6 @@ namespace MeoAsstGui emuProcess.Start(); emuProcess.StandardInput.WriteLine(EmulatorPath); emuProcess.StandardInput.WriteLine("exit"); - emuProcess.Close(); int delay = 0; if (!int.TryParse(EmulatorWaitSeconds, out delay)) { From 8f33f1fe521cac8ae70ab5c37d97e35d08492da7 Mon Sep 17 00:00:00 2001 From: cglcv Date: Sat, 11 Jun 2022 18:56:44 +0800 Subject: [PATCH 04/11] Update Bootstrapper.cs --- src/MeoAsstGui/Bootstrapper.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/MeoAsstGui/Bootstrapper.cs b/src/MeoAsstGui/Bootstrapper.cs index e924cf9e3f..60ae2cb578 100644 --- a/src/MeoAsstGui/Bootstrapper.cs +++ b/src/MeoAsstGui/Bootstrapper.cs @@ -14,6 +14,7 @@ using System.Windows.Threading; using Stylet; using StyletIoC; using Microsoft.Toolkit.Uwp.Notifications; +using System.Runtime.InteropServices; namespace MeoAsstGui { @@ -38,8 +39,14 @@ namespace MeoAsstGui protected override void OnExit(ExitEventArgs e) { // MessageBox.Show("O(∩_∩)O 拜拜"); + //关闭程序时清理操作中心中的通知 - ToastNotificationManagerCompat.History.Clear(); + var os = RuntimeInformation.OSDescription.ToString(); + if (os.ToString().CompareTo("Microsoft Windows 10.0.10240") >= 0) + { + ToastNotificationManagerCompat.History.Clear(); + } + ViewStatusStorage.Save(); } From 1b454e2a3ffe5dcb1f413e0fac1dd9c1e6264095 Mon Sep 17 00:00:00 2001 From: cglcv Date: Sun, 12 Jun 2022 20:54:10 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=99=84=E5=8A=A0?= =?UTF-8?q?=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserControl/StartSettingsUserControl.xaml | 4 ++ .../ViewModels/SettingsViewModel.cs | 39 +++++++++++++++---- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/MeoAsstGui/UserControl/StartSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/StartSettingsUserControl.xaml index 23af617aaf..fbbbb126b7 100644 --- a/src/MeoAsstGui/UserControl/StartSettingsUserControl.xaml +++ b/src/MeoAsstGui/UserControl/StartSettingsUserControl.xaml @@ -35,6 +35,10 @@