From 44351196bbbf4d389ce03e794039b4b7d131ddfa Mon Sep 17 00:00:00 2001 From: Hydrogina <2221964239@qq.com> Date: Mon, 12 Sep 2022 17:11:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E9=80=89=E9=A1=B9=20=E9=80=80=E5=87=BA?= =?UTF-8?q?=E5=B9=B6=E5=85=B3=E9=97=AD=E6=A8=A1=E6=8B=9F=E5=99=A8=E5=B9=B6?= =?UTF-8?q?=E4=BC=91=E7=9C=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Localizations/en-us.xaml | 1 + .../Resources/Localizations/ja-jp.xaml | 1 + .../Resources/Localizations/ko-kr.xaml | 1 + .../Resources/Localizations/pallas.xaml | 1 + .../Resources/Localizations/zh-cn.xaml | 1 + .../Resources/Localizations/zh-tw.xaml | 1 + .../ViewModels/TaskQueueViewModel.cs | 26 ++++++++++++++++++- src/MeoAsstGui/Views/TaskQueueView.xaml | 2 +- 8 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml index 2dd7c04d7e..ae1474aa19 100644 --- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml +++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml @@ -180,6 +180,7 @@ Close Emulator Exit and Close Emulator Hibernate* + Exit and Close Emulator and Hibernate* Shutdown* Link Start! diff --git a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml index d1e1b45627..66f985ad17 100644 --- a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml +++ b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml @@ -180,6 +180,7 @@ エミュレータを終了する MAAとエミュレータを終了する 休止状態にする* + 退出并关闭模拟器并休眠* シャットダウン* Link Start! diff --git a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml index e3b0fe7604..f734869ac9 100644 --- a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml +++ b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml @@ -180,6 +180,7 @@ 에뮬레이터를 종료 MAA와 에뮬레이터를 종료 하이버네이션* + 退出并关闭模拟器并休眠* 컴퓨터를 종료* Link Start! diff --git a/src/MeoAsstGui/Resources/Localizations/pallas.xaml b/src/MeoAsstGui/Resources/Localizations/pallas.xaml index 3e9bfae033..1fba8b15fa 100644 --- a/src/MeoAsstGui/Resources/Localizations/pallas.xaml +++ b/src/MeoAsstGui/Resources/Localizations/pallas.xaml @@ -180,6 +180,7 @@ 💃💃🍸 🍺🍷🍸🍸🍷 💃🍷 + 退出并关闭模拟器并休眠* 🍷🍷 🍻🍻🍻🍺🍸💃 diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml index 3b8a2ea4ab..fa94880da8 100644 --- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml +++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml @@ -180,6 +180,7 @@ 关闭模拟器 退出并关闭模拟器 休眠* + 退出并关闭模拟器并休眠* 关机* Link Start! diff --git a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml index 39df0a99b8..c117d6b0b6 100644 --- a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml +++ b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml @@ -180,6 +180,7 @@ 關閉模擬器 退出並關閉模擬器 休眠* + 退出並關閉模擬器並休眠* 關機* Link Start! diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index 9cf247ea0d..375ba3896e 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -88,7 +88,7 @@ namespace MeoAsstGui { SetAndNotify(ref _actionAfterCompleted, value.ToString()); string storeValue = ActionType.DoNothing.ToString(); - if (value != ActionType.Shutdown && value != ActionType.Hibernate) + if (value != ActionType.Shutdown && value != ActionType.Hibernate && value != ActionType.ExitMAAAndCloseEmulatorAndHibernate) { storeValue = value.ToString(); } @@ -270,6 +270,7 @@ namespace MeoAsstGui // new GenericCombData{ Display="待机",Value=ActionTypeAfterCompleted.Suspend }, new GenericCombData { Display = Localization.GetString("Hibernate"), Value = ActionType.Hibernate }, + new GenericCombData { Display = Localization.GetString("ExitMAAAndCloseEmulatorAndHibernate"), Value = ActionType.ExitMAAAndCloseEmulatorAndHibernate }, new GenericCombData { Display = Localization.GetString("Shutdown"), Value = ActionType.Shutdown }, }; var temp_order_list = new List(new DragItemViewModel[task_list.Length]); @@ -1090,6 +1091,11 @@ namespace MeoAsstGui /// Hibernate, + /// + /// Exits MAA and emulator and computer hibernates. + /// + ExitMAAAndCloseEmulatorAndHibernate, + /// /// Computer shutdown. /// @@ -1168,6 +1174,24 @@ namespace MeoAsstGui Process.Start("shutdown.exe", "-h"); break; + case ActionType.ExitMAAAndCloseEmulatorAndHibernate: + if (!killEumlatorbyWindow()) + { + AddLog(Localization.GetString("CloseEmulatorFailed"), LogColor.Error); + } + + // 休眠提示 + AddLog(Localization.GetString("HibernatePrompt"), LogColor.Error); + + // 休眠不能加时间参数，https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1133 + Process.Start("shutdown.exe", "-h"); + + // Shutdown 会调用 OnExit 但 Exit 不会 + Application.Current.Shutdown(); + + // Environment.Exit(0); + break; + default: break; } diff --git a/src/MeoAsstGui/Views/TaskQueueView.xaml b/src/MeoAsstGui/Views/TaskQueueView.xaml index 9589e14c4b..7ca2f14247 100644 --- a/src/MeoAsstGui/Views/TaskQueueView.xaml +++ b/src/MeoAsstGui/Views/TaskQueueView.xaml @@ -125,7 +125,7 @@ TextWrapping="Wrap" /> Date: Mon, 12 Sep 2022 18:20:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20i18n=20=E9=80=80=E5=87=BA=E5=B9=B6?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=A8=A1=E6=8B=9F=E5=99=A8=E5=B9=B6=E4=BC=91?= =?UTF-8?q?=E7=9C=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/Resources/Localizations/ja-jp.xaml | 2 +- src/MeoAsstGui/Resources/Localizations/ko-kr.xaml | 1 - src/MeoAsstGui/Resources/Localizations/pallas.xaml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml index 66f985ad17..57ae6837e4 100644 --- a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml +++ b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml @@ -180,7 +180,7 @@ エミュレータを終了する MAAとエミュレータを終了する 休止状態にする* - 退出并关闭模拟器并休眠* + MAAとエミューレータを終了し、PCをスリープさせる* シャットダウン* Link Start! diff --git a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml index f734869ac9..e3b0fe7604 100644 --- a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml +++ b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml @@ -180,7 +180,6 @@ 에뮬레이터를 종료 MAA와 에뮬레이터를 종료 하이버네이션* - 退出并关闭模拟器并休眠* 컴퓨터를 종료* Link Start! diff --git a/src/MeoAsstGui/Resources/Localizations/pallas.xaml b/src/MeoAsstGui/Resources/Localizations/pallas.xaml index 1fba8b15fa..3e9bfae033 100644 --- a/src/MeoAsstGui/Resources/Localizations/pallas.xaml +++ b/src/MeoAsstGui/Resources/Localizations/pallas.xaml @@ -180,7 +180,6 @@ 💃💃🍸 🍺🍷🍸🍸🍷 💃🍷 - 退出并关闭模拟器并休眠* 🍷🍷 🍻🍻🍻🍺🍸💃