调整翻译

Uotan-Dev · Jul 22, 2024 · 57a934b · 57a934b
1 parent 7339bef
commit 57a934b
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 13 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
@@ -267,7 +267,7 @@
   <data name="Home_Disconnected" xml:space="preserve">
     <value>The device has been disconnected</value>
   </data>
-  <data name="Common_OpenADB" xml:space="preserve">
+  <data name="Common_EnterRecOrOpenADB" xml:space="preserve">
     <value>Please enter Recovery mode or enable USB debugging!</value>
   </data>
   <data name="Common_NotConnected" xml:space="preserve">
@@ -1173,4 +1173,7 @@
   <data name="Wiredflash_SelectFlashFile" xml:space="preserve">
     <value>Please select the flashing file!</value>
   </data>
+  <data name="Common_OpenADB" xml:space="preserve">
+    <value>Please enable USB debugging!</value>
+  </data>
 </root>
diff --git a/UotanToolbox/Assets/Resources.zh-CN.resx b/UotanToolbox/Assets/Resources.zh-CN.resx
@@ -267,7 +267,7 @@
   <data name="Home_Disconnected" xml:space="preserve">
     <value>设备已断开连接</value>
   </data>
-  <data name="Common_OpenADB" xml:space="preserve">
+  <data name="Common_EnterRecOrOpenADB" xml:space="preserve">
     <value>请进入Recovery模式或开启USB调试！</value>
   </data>
   <data name="Common_NotConnected" xml:space="preserve">
@@ -1170,4 +1170,7 @@
   <data name="Wiredflash_SelectFlashFile" xml:space="preserve">
     <value>请选择刷机文件！</value>
   </data>
+  <data name="Common_OpenADB" xml:space="preserve">
+    <value>请开启USB调试！</value>
+  </data>
 </root>
diff --git a/UotanToolbox/Features/Home/HomeViewModel.cs b/UotanToolbox/Features/Home/HomeViewModel.cs
@@ -200,6 +200,26 @@ public async Task FreshDeviceList()
         }
     }
 
+    private async Task SystemControl(string shell)
+    {
+        if (await GetDevicesInfo.SetDevicesInfoLittle())
+        {
+            MainViewModel sukiViewModel = GlobalData.MainViewModelInstance;
+            if (sukiViewModel.Status == GetTranslation("Home_System"))
+            {
+                await CallExternalProgram.ADB($"-s {Global.thisdevice} {shell}");
+            }
+            else
+            {
+                SukiHost.ShowDialog(new PureDialog(GetTranslation("Common_OpenADB")), allowBackgroundClose: true);
+            }
+        }
+        else
+        {
+            SukiHost.ShowDialog(new PureDialog(GetTranslation("Common_NotConnected")), allowBackgroundClose: true);
+        }
+    }
+
     private async Task ADBControl(string shell)
     {
         if (await GetDevicesInfo.SetDevicesInfoLittle())
@@ -211,7 +231,7 @@ private async Task ADBControl(string shell)
             }
             else
             {
-                SukiHost.ShowDialog(new PureDialog(GetTranslation("Common_OpenADB")), allowBackgroundClose: true);
+                SukiHost.ShowDialog(new PureDialog(GetTranslation("Common_EnterRecOrOpenADB")), allowBackgroundClose: true);
             }
         }
         else
@@ -242,31 +262,31 @@ private async Task FastbootControl(string shell)
 
 
     [RelayCommand]
-    public async Task Back() => await ADBControl("shell input keyevent 4");
+    public async Task Back() => await SystemControl("shell input keyevent 4");
 
     [RelayCommand]
-    public async Task Home() => await ADBControl("shell input keyevent 3");
+    public async Task Home() => await SystemControl("shell input keyevent 3");
 
     [RelayCommand]
-    public async Task Mul() => await ADBControl("shell input keyevent 187");
+    public async Task Mul() => await SystemControl("shell input keyevent 187");
 
     [RelayCommand]
-    public async Task Lock() => await ADBControl("shell input keyevent 26");
+    public async Task Lock() => await SystemControl("shell input keyevent 26");
 
     [RelayCommand]
-    public async Task VolU() => await ADBControl("shell input keyevent 24");
+    public async Task VolU() => await SystemControl("shell input keyevent 24");
 
     [RelayCommand]
-    public async Task VolD() => await ADBControl("shell input keyevent 25");
+    public async Task VolD() => await SystemControl("shell input keyevent 25");
 
     [RelayCommand]
-    public async Task Mute() => await ADBControl("shell input keyevent 164");
+    public async Task Mute() => await SystemControl("shell input keyevent 164");
 
     [RelayCommand]
     public async Task SC()
     {
         string pngname = String.Format($"{DateAndTime.Now:yyyy-MM-dd_HH-mm-ss}");
-        await ADBControl($"shell /system/bin/screencap -p /sdcard/{pngname}.png");
+        await SystemControl($"shell /system/bin/screencap -p /sdcard/{pngname}.png");
         await SukiHost.ShowToast(GetTranslation("Home_Succeeded"), $"{GetTranslation("Home_Saved")} {pngname}.png {GetTranslation("Home_ToStorage")}", NotificationType.Success);
     }
 
@@ -292,7 +312,7 @@ public async Task ARSide()
             }
             else
             {
-                SukiHost.ShowDialog(new PureDialog(GetTranslation("Common_OpenADB")), allowBackgroundClose: true);
+                SukiHost.ShowDialog(new PureDialog(GetTranslation("Common_EnterRecOrOpenADB")), allowBackgroundClose: true);
             }
         }
         else