From 5a16897211cfffc10bff8304a41ace8817227d59 Mon Sep 17 00:00:00 2001
From: mujianwu <lrh15563910083@163.com>
Date: Sun, 29 Dec 2024 18:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UotanToolbox/Assets/Resources.Designer.cs                | 9 +++++++++
 UotanToolbox/Assets/Resources.resx                       | 3 +++
 UotanToolbox/Assets/Resources.zh-CN.resx                 | 3 +++
 .../Features/FormatExtract/FormatExtractView.axaml.cs    | 2 +-
 UotanToolbox/Features/Home/HomeViewModel.cs              | 2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/UotanToolbox/Assets/Resources.Designer.cs b/UotanToolbox/Assets/Resources.Designer.cs
index ccd7056d..0ea81c64 100644
--- a/UotanToolbox/Assets/Resources.Designer.cs
+++ b/UotanToolbox/Assets/Resources.Designer.cs
@@ -2304,6 +2304,15 @@ public static string Home_Shutdown {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Execution successful, unplug the device connection cable to shut down! 的本地化字符串。
+        /// </summary>
+        public static string Home_ShutDownTip {
+            get {
+                return ResourceManager.GetString("Home_ShutDownTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Sideload 的本地化字符串。
         /// </summary>
diff --git a/UotanToolbox/Assets/Resources.resx b/UotanToolbox/Assets/Resources.resx
index 338b568c..f1291464 100644
--- a/UotanToolbox/Assets/Resources.resx
+++ b/UotanToolbox/Assets/Resources.resx
@@ -1510,4 +1510,7 @@ If you wish to replace Magisk, please first select your Magisk on the Basic Flas
   <data name="Modifypartition_EnterName" xml:space="preserve">
     <value>Please enter the partition name!</value>
   </data>
+  <data name="Home_ShutDownTip" xml:space="preserve">
+    <value>Execution successful, unplug the device connection cable to shut down!</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/UotanToolbox/Assets/Resources.zh-CN.resx b/UotanToolbox/Assets/Resources.zh-CN.resx
index 6c79a646..88fd023d 100644
--- a/UotanToolbox/Assets/Resources.zh-CN.resx
+++ b/UotanToolbox/Assets/Resources.zh-CN.resx
@@ -1507,4 +1507,7 @@ ADB下填写序号，一次一个！</value>
   <data name="Modifypartition_EnterName" xml:space="preserve">
     <value>请输入分区名称！</value>
   </data>
+  <data name="Home_ShutDownTip" xml:space="preserve">
+    <value>执行成功，拔出设备连接线即可关机！</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/UotanToolbox/Features/FormatExtract/FormatExtractView.axaml.cs b/UotanToolbox/Features/FormatExtract/FormatExtractView.axaml.cs
index 8c312450..2b02953f 100644
--- a/UotanToolbox/Features/FormatExtract/FormatExtractView.axaml.cs
+++ b/UotanToolbox/Features/FormatExtract/FormatExtractView.axaml.cs
@@ -470,7 +470,7 @@ private async void FastbootFormat(object sender, RoutedEventArgs args)
         if (await GetDevicesInfo.SetDevicesInfoLittle())
         {
             MainViewModel sukiViewModel = GlobalData.MainViewModelInstance;
-            if (sukiViewModel.Status == GetTranslation("Home_Fastboot"))
+            if (sukiViewModel.Status == GetTranslation("Home_Fastboot") || sukiViewModel.Status == GetTranslation("Home_Fastbootd"))
             {
                 if (!string.IsNullOrEmpty(FormatName.Text))
                 {
diff --git a/UotanToolbox/Features/Home/HomeViewModel.cs b/UotanToolbox/Features/Home/HomeViewModel.cs
index 0ae32c68..c2008d35 100644
--- a/UotanToolbox/Features/Home/HomeViewModel.cs
+++ b/UotanToolbox/Features/Home/HomeViewModel.cs
@@ -390,7 +390,7 @@ public async Task PowerOff()
                 string output = await CallExternalProgram.Fastboot($"-s {Global.thisdevice} oem poweroff");
                 _ = output.Contains("unknown command")
                     ? Global.MainDialogManager.CreateDialog().WithTitle(GetTranslation("Common_Error")).OfType(NotificationType.Error).WithContent(GetTranslation("Home_NotSupported")).Dismiss().ByClickingBackground().TryShow()
-                    : Global.MainDialogManager.CreateDialog().WithTitle(GetTranslation("Common_Succ")).OfType(NotificationType.Success).WithContent(GetTranslation("Home_Successful")).Dismiss().ByClickingBackground().TryShow();
+                    : Global.MainDialogManager.CreateDialog().WithTitle(GetTranslation("Common_Succ")).OfType(NotificationType.Success).WithContent(GetTranslation("Home_ShutDownTip")).Dismiss().ByClickingBackground().TryShow();
             }
             else if (sukiViewModel.Status == GetTranslation("Home_OpenHOS"))
             {