fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 改了点解压adb的逻辑

Browse Source
This commit is contained in:
MistEO
2023-05-18 00:00:52 +08:00
parent 9b6e123b03
commit ea3ed4b0ca
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
View File

@@ -2357,17 +2357,12 @@ namespace MaaWpfGui.ViewModels.UI
const string UnzipDir = "adb";
const string NewAdb = UnzipDir + "/platform-tools/adb.exe";
void unzip_adb()
if (Directory.Exists(UnzipDir))
{
if (Directory.Exists(UnzipDir))
{
Directory.Delete(UnzipDir, true);
}
ZipFile.ExtractToDirectory(GoogleAdbFilename, UnzipDir);
Directory.Delete(UnzipDir, true);
}
unzip_adb();
ZipFile.ExtractToDirectory(GoogleAdbFilename, UnzipDir);
bool replaced = false;
try
@@ -2380,7 +2375,6 @@ namespace MaaWpfGui.ViewModels.UI
File.Copy(AdbPath, AdbPath + ".bak", true);
File.Copy(NewAdb, AdbPath, true);
Directory.Delete(UnzipDir, true);
replaced = true;
}
catch (Exception ex)
@@ -2401,12 +2395,7 @@ namespace MaaWpfGui.ViewModels.UI
}
else
{
if (!File.Exists(NewAdb))
{
unzip_adb();
}
AdbPath = UnzipDir + "/platform-tools/adb.exe";
AdbPath = NewAdb;
await Execute.OnUIThreadAsync(() =>
{