调整提示

Uotan-Dev · Dec 29, 2024 · 5a16897 · 5a16897
1 parent 6aa9d0d
commit 5a16897
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/UotanToolbox/Assets/Resources.Designer.cs b/UotanToolbox/Assets/Resources.Designer.cs
diff --git 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>
diff --git 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>
diff --git 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
@@ -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"))
             {